summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorSTRWarrior <niels.breuker@hotmail.nl>2014-01-12 15:27:50 +0100
committerSTRWarrior <niels.breuker@hotmail.nl>2014-01-12 15:27:50 +0100
commitc5603ce064d7e4e897aa92d6f43d407802ae3687 (patch)
tree8a50533bd8e07807587100e3a1016d07f3335406 /src/World.cpp
parentAdded cWorld::SpawnMinecart. (diff)
downloadcuberite-c5603ce064d7e4e897aa92d6f43d407802ae3687.tar
cuberite-c5603ce064d7e4e897aa92d6f43d407802ae3687.tar.gz
cuberite-c5603ce064d7e4e897aa92d6f43d407802ae3687.tar.bz2
cuberite-c5603ce064d7e4e897aa92d6f43d407802ae3687.tar.lz
cuberite-c5603ce064d7e4e897aa92d6f43d407802ae3687.tar.xz
cuberite-c5603ce064d7e4e897aa92d6f43d407802ae3687.tar.zst
cuberite-c5603ce064d7e4e897aa92d6f43d407802ae3687.zip
Diffstat (limited to '')
-rw-r--r--src/World.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/World.cpp b/src/World.cpp
index b5599c660..d7edbe3f8 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -1648,23 +1648,23 @@ int cWorld::SpawnExperienceOrb(double a_X, double a_Y, double a_Z, int a_Reward)
-int cWorld::SpawnMinecart(double a_X, double a_Y, double a_Z, int a_MinecartType)
+int cWorld::SpawnMinecart(double a_X, double a_Y, double a_Z, int a_MinecartType, cItem a_Content, int a_BlockHeight)
{
cMinecart * Minecart;
switch (a_MinecartType)
{
- case E_ITEM_MINECART: Minecart = new cEmptyMinecart (a_X, a_Y, a_Z); break;
+ case E_ITEM_MINECART: Minecart = new cEmptyMinecart (a_X, a_Y, a_Z, a_Content, a_BlockHeight); break;
case E_ITEM_CHEST_MINECART: Minecart = new cMinecartWithChest (a_X, a_Y, a_Z); break;
case E_ITEM_FURNACE_MINECART: Minecart = new cMinecartWithFurnace (a_X, a_Y, a_Z); break;
case E_ITEM_MINECART_WITH_TNT: Minecart = new cMinecartWithTNT (a_X, a_Y, a_Z); break;
case E_ITEM_MINECART_WITH_HOPPER: Minecart = new cMinecartWithHopper (a_X, a_Y, a_Z); break;
default:
{
- ASSERT(!"Unhandled minecart item");
return -1;
}
} // switch (a_MinecartType)
Minecart->Initialize(this);
+ return Minecart->GetUniqueID();
}