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

@@ -36,8 +36,7 @@ void ControlledByPlayerGoal::stop()
bool ControlledByPlayerGoal::canUse()
{
shared_ptr<Player> player = dynamic_pointer_cast<Player>( mob->rider.lock() );
return mob->isAlive() && player && (boosting || mob->canBeControlledByRider());
return mob->isAlive() && mob->rider.lock() != NULL && mob->rider.lock()->instanceof(eTYPE_PLAYER) && (boosting || mob->canBeControlledByRider());
}
void ControlledByPlayerGoal::tick()
@@ -120,7 +119,7 @@ void ControlledByPlayerGoal::tick()
if (carriedItem != NULL && carriedItem->id == Item::carrotOnAStick_Id)
{
carriedItem->hurt(1, player);
carriedItem->hurtAndBreak(1, player);
if (carriedItem->count == 0)
{
@@ -134,6 +133,11 @@ void ControlledByPlayerGoal::tick()
mob->travel(0, moveSpeed);
}
bool ControlledByPlayerGoal::isNoJumpTile(int tile)
{
return Tile::tiles[tile] != NULL && (Tile::tiles[tile]->getRenderShape() == Tile::SHAPE_STAIRS || (dynamic_cast<HalfSlabTile *>(Tile::tiles[tile]) != NULL) );
}
bool ControlledByPlayerGoal::isBoosting()
{
return boosting;