December 2014 files

This commit is contained in:
Loki Rautio
2026-03-01 11:00:23 -06:00
parent b691c43c44
commit 8fd3ac6e37
2049 changed files with 260190 additions and 134787 deletions

View File

@@ -6,26 +6,26 @@
SaddleItem::SaddleItem(int id) : Item(id)
{
maxStackSize = 1;
maxStackSize = 1;
}
bool SaddleItem::interactEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<Mob> mob)
bool SaddleItem::interactEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, shared_ptr<LivingEntity> mob)
{
if ( dynamic_pointer_cast<Pig>(mob) )
if ( (mob != NULL) && mob->instanceof(eTYPE_PIG) )
{
shared_ptr<Pig> pig = dynamic_pointer_cast<Pig>(mob);
if (!pig->hasSaddle() && !pig->isBaby())
shared_ptr<Pig> pig = dynamic_pointer_cast<Pig>(mob);
if (!pig->hasSaddle() && !pig->isBaby())
{
pig->setSaddle(true);
itemInstance->count--;
}
pig->setSaddle(true);
itemInstance->count--;
}
return true;
}
}
return false;
}
bool SaddleItem::hurtEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<Mob> mob, shared_ptr<Mob> attacker)
bool SaddleItem::hurtEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<LivingEntity> mob, shared_ptr<LivingEntity> attacker)
{
interactEnemy(itemInstance, mob);
return true;
interactEnemy(itemInstance, nullptr, mob);
return true;
}