summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-07-13 16:25:52 +0200
committerTycho <work.tycho+git@gmail.com>2014-07-13 16:25:52 +0200
commit2a0c041ad8eaa42e4293762df18d14c77e11ea49 (patch)
tree30c62bd1f4e1f95bc06ef5f2b833f3327b540ec5
parentMade CreateProjectile a pointer (diff)
downloadcuberite-2a0c041ad8eaa42e4293762df18d14c77e11ea49.tar
cuberite-2a0c041ad8eaa42e4293762df18d14c77e11ea49.tar.gz
cuberite-2a0c041ad8eaa42e4293762df18d14c77e11ea49.tar.bz2
cuberite-2a0c041ad8eaa42e4293762df18d14c77e11ea49.tar.lz
cuberite-2a0c041ad8eaa42e4293762df18d14c77e11ea49.tar.xz
cuberite-2a0c041ad8eaa42e4293762df18d14c77e11ea49.tar.zst
cuberite-2a0c041ad8eaa42e4293762df18d14c77e11ea49.zip
m---------lib/polarssl0
-rw-r--r--src/Items/ItemThrowable.h4
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/polarssl b/lib/polarssl
-Subproject 1ed82759c68f92c4acc7e3f33b850cf9f01c8ab
+Subproject 784b04ff9afd5faeaeb15c3fa159ff98adf5518
diff --git a/src/Items/ItemThrowable.h b/src/Items/ItemThrowable.h
index fde7b8e67..c151c5d3a 100644
--- a/src/Items/ItemThrowable.h
+++ b/src/Items/ItemThrowable.h
@@ -35,7 +35,7 @@ public:
cFastRandom Random;
a_World->BroadcastSoundEffect("random.bow", a_Player->GetPosX(), a_Player->GetPosY() - a_Player->GetHeight(), a_Player->GetPosZ(), 0.5f, 0.4f / (Random.NextFloat(1.0f) * 0.4f + 0.8f));
- if (a_World->CreateProjectile(Pos.x, Pos.y, Pos.z, m_ProjectileKind, a_Player, a_Player->GetEquippedItem(), &Speed) < 0)
+ if (a_World->CreateProjectile(Pos.x, Pos.y, Pos.z, m_ProjectileKind, a_Player, &a_Player->GetEquippedItem(), &Speed) < 0)
{
return false;
}
@@ -135,7 +135,7 @@ public:
return false;
}
- if (a_World->CreateProjectile(a_BlockX + 0.5, a_BlockY + 1, a_BlockZ + 0.5, m_ProjectileKind, a_Player, a_Player->GetEquippedItem()) < 0)
+ if (a_World->CreateProjectile(a_BlockX + 0.5, a_BlockY + 1, a_BlockZ + 0.5, m_ProjectileKind, a_Player, &a_Player->GetEquippedItem()) < 0)
{
return false;
}