summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Pickup.cpp8
-rw-r--r--src/Entities/Player.cpp2
2 files changed, 4 insertions, 6 deletions
diff --git a/src/Entities/Pickup.cpp b/src/Entities/Pickup.cpp
index bbc3313da..f37bb6b98 100644
--- a/src/Entities/Pickup.cpp
+++ b/src/Entities/Pickup.cpp
@@ -45,7 +45,7 @@ public:
cItem & Item = OtherPickup.GetItem();
if ((Distance < 1.2) && Item.IsEqual(m_Pickup->GetItem()) && OtherPickup.CanCombine())
{
- short CombineCount = Item.m_ItemCount;
+ char CombineCount = Item.m_ItemCount;
if ((CombineCount + m_Pickup->GetItem().m_ItemCount) > Item.GetMaxStackSize())
{
CombineCount = Item.GetMaxStackSize() - m_Pickup->GetItem().m_ItemCount;
@@ -56,7 +56,7 @@ public:
return false;
}
- m_Pickup->GetItem().AddCount(static_cast<char>(CombineCount));
+ m_Pickup->GetItem().AddCount(CombineCount);
Item.m_ItemCount -= CombineCount;
if (Item.m_ItemCount <= 0)
@@ -265,11 +265,9 @@ bool cPickup::CollectedBy(cEntity & a_Dest)
// Pickup cannot be collected because the entity has not enough space
return false;
}
-
}
else if (a_Dest.IsPlayer())
{
-
auto & Player = static_cast<cPlayer &>(a_Dest);
// If the player is a spectator, he cannot collect anything
@@ -284,7 +282,7 @@ bool cPickup::CollectedBy(cEntity & a_Dest)
return false;
}
- int NumAdded = Player.GetInventory().AddItem(m_Item);
+ char NumAdded = Player.GetInventory().AddItem(m_Item);
if (NumAdded > 0)
{
// Check achievements
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index b0ab94874..c5c3114d8 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -2344,7 +2344,7 @@ void cPlayer::SendBlocksAround(int a_BlockX, int a_BlockY, int a_BlockZ, int a_R
{
for (int x = a_BlockX - a_Range + 1; x < a_BlockX + a_Range; x++)
{
- blks.emplace_back(x, y, z, E_BLOCK_AIR, 0); // Use fake blocktype, it will get set later on.
+ blks.emplace_back(x, y, z, E_BLOCK_AIR, char(0)); // Use fake blocktype, it will get set later on.
}
}
} // for y