summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheJumper <maximilian.springer@web.de>2014-02-24 15:38:38 +0100
committerTheJumper <maximilian.springer@web.de>2014-02-24 15:38:38 +0100
commit0b6aa7b3708b4651ecea5c2bdd58fb0ccb430cbc (patch)
tree6b4146ab97f1637d18cd2f7edf01a5d92623e387
parentMerge remote-tracking branch 'origin/master' (diff)
downloadcuberite-0b6aa7b3708b4651ecea5c2bdd58fb0ccb430cbc.tar
cuberite-0b6aa7b3708b4651ecea5c2bdd58fb0ccb430cbc.tar.gz
cuberite-0b6aa7b3708b4651ecea5c2bdd58fb0ccb430cbc.tar.bz2
cuberite-0b6aa7b3708b4651ecea5c2bdd58fb0ccb430cbc.tar.lz
cuberite-0b6aa7b3708b4651ecea5c2bdd58fb0ccb430cbc.tar.xz
cuberite-0b6aa7b3708b4651ecea5c2bdd58fb0ccb430cbc.tar.zst
cuberite-0b6aa7b3708b4651ecea5c2bdd58fb0ccb430cbc.zip
Diffstat (limited to '')
-rw-r--r--src/Mobs/IronGolem.cpp1
-rw-r--r--src/Mobs/Magmacube.cpp1
-rw-r--r--src/Mobs/Monster.cpp2
-rw-r--r--src/Mobs/Monster.h4
-rw-r--r--src/Mobs/SnowGolem.cpp1
5 files changed, 6 insertions, 3 deletions
diff --git a/src/Mobs/IronGolem.cpp b/src/Mobs/IronGolem.cpp
index 057834afd..dae4615e4 100644
--- a/src/Mobs/IronGolem.cpp
+++ b/src/Mobs/IronGolem.cpp
@@ -18,6 +18,7 @@ cIronGolem::cIronGolem(void) :
void cIronGolem::GetDrops(cItems & a_Drops, cEntity * a_Killer)
{
+ UNUSED(a_Killer);
AddRandomDropItem(a_Drops, 0, 5, E_ITEM_IRON);
AddRandomDropItem(a_Drops, 0, 2, E_BLOCK_FLOWER);
}
diff --git a/src/Mobs/Magmacube.cpp b/src/Mobs/Magmacube.cpp
index ec6137ca6..05405f082 100644
--- a/src/Mobs/Magmacube.cpp
+++ b/src/Mobs/Magmacube.cpp
@@ -19,6 +19,7 @@ cMagmaCube::cMagmaCube(int a_Size) :
void cMagmaCube::GetDrops(cItems & a_Drops, cEntity * a_Killer)
{
+ UNUSED(a_Killer);
if (GetSize() > 1)
{
AddRandomUncommonDropItem(a_Drops, 25.0f, E_ITEM_MAGMA_CREAM);
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 4ab485321..ac9137ccd 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -81,13 +81,13 @@ cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString
, m_AttackDamage(1)
, m_AttackRange(2)
, m_AttackInterval(0)
+ , m_SightDistance(25)
, m_DropChanceWeapon(0.085)
, m_DropChanceHelmet(0.085)
, m_DropChanceChestplate(0.085)
, m_DropChanceLeggings(0.085)
, m_DropChanceBoots(0.085)
, m_CanPickUpLoot(true)
- , m_SightDistance(25)
, m_BurnsInDaylight(false)
{
if (!a_ConfigName.empty())
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index 49d0cf9ef..776426a0d 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -253,10 +253,10 @@ protected:
/** Adds one rare item out of the list of rare items a_Items modified by the looting level a_LootingLevel(I-III or custom) to the itemdrop a_Drops*/
void AddRandomRareDropItem(cItems & a_Drops, cItems & a_Items, short a_LootingLevel);
- /** Adds armor that is equipped with the chance of 8,5% (Looting 3: 11,5%) to the drop*/
+ /** Adds armor that is equipped with the chance saved in m_DropChance[...] (this will be greter than 1 if piccked up or 0.085 + (0.01 per LootingLevel) if born with) to the drop*/
void AddRandomArmorDropItem(cItems & a_Drops, short a_LootingLevel);
- /** Adds weapon that is equipped with the chance of 8,5% (Looting 3: 11,5%) to the drop*/
+ /** Adds weapon that is equipped with the chance saved in m_DropChance[...] (this will be greter than 1 if piccked up or 0.085 + (0.01 per LootingLevel) if born with) to the drop*/
void AddRandomWeaponDropItem(cItems & a_Drops, short a_LootingLevel);
diff --git a/src/Mobs/SnowGolem.cpp b/src/Mobs/SnowGolem.cpp
index b68d18575..67e3a3bb8 100644
--- a/src/Mobs/SnowGolem.cpp
+++ b/src/Mobs/SnowGolem.cpp
@@ -19,6 +19,7 @@ cSnowGolem::cSnowGolem(void) :
void cSnowGolem::GetDrops(cItems & a_Drops, cEntity * a_Killer)
{
+ UNUSED(a_Killer);
AddRandomDropItem(a_Drops, 0, 15, E_ITEM_SNOWBALL);
}