feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict * feat: TU19 (Dec 2014) Features & Content (#32) * December 2014 files * Working release build * Fix compilation issues * Add sound to Windows64Media * Add DLC content and force Tutorial DLC * Revert "Add DLC content and force Tutorial DLC" This reverts commit 97a43994725008e35fceb984d5549df9c8cea470. * Disable broken light packing * Disable breakpoint during DLC texture map load Allows DLC loading but the DLC textures are still broken * Fix post build not working * ... * fix vs2022 build * fix cmake build --------- Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -7,19 +7,30 @@ OwnerHurtTargetGoal::OwnerHurtTargetGoal(TamableAnimal *tameAnimal) : TargetGoal
|
||||
{
|
||||
this->tameAnimal = tameAnimal;
|
||||
setRequiredControlFlags(TargetGoal::TargetFlag);
|
||||
timestamp = 0;
|
||||
}
|
||||
|
||||
bool OwnerHurtTargetGoal::canUse()
|
||||
{
|
||||
if (!tameAnimal->isTame()) return false;
|
||||
shared_ptr<Mob> owner = tameAnimal->getOwner();
|
||||
shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>( tameAnimal->getOwner() );
|
||||
if (owner == NULL) return false;
|
||||
ownerLastHurt = weak_ptr<Mob>(owner->getLastHurtMob());
|
||||
return canAttack(ownerLastHurt.lock(), false);
|
||||
ownerLastHurt = weak_ptr<LivingEntity>(owner->getLastHurtMob());
|
||||
int ts = owner->getLastHurtMobTimestamp();
|
||||
shared_ptr<LivingEntity> locked = ownerLastHurt.lock();
|
||||
return ts != timestamp && canAttack(locked, false) && tameAnimal->wantsToAttack(locked, owner);
|
||||
}
|
||||
|
||||
void OwnerHurtTargetGoal::start()
|
||||
{
|
||||
mob->setTarget(ownerLastHurt.lock());
|
||||
TargetGoal::start();
|
||||
|
||||
shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>( tameAnimal->getOwner() );
|
||||
if (owner != NULL)
|
||||
{
|
||||
timestamp = owner->getLastHurtMobTimestamp();
|
||||
|
||||
|
||||
TargetGoal::start();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user