mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-05-21 11:13:51 +00:00
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 97a4399472.
* 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:
parent
84c31a2331
commit
b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
|
|
@ -9,14 +9,14 @@
|
|||
#include "BasicTypeContainers.h"
|
||||
#include "PlayGoal.h"
|
||||
|
||||
PlayGoal::PlayGoal(Villager *mob, float speed)
|
||||
PlayGoal::PlayGoal(Villager *mob, double speedModifier)
|
||||
{
|
||||
followFriend = weak_ptr<Mob>();
|
||||
followFriend = weak_ptr<LivingEntity>();
|
||||
wantedX = wantedY = wantedZ = 0.0;
|
||||
playTime = 0;
|
||||
|
||||
this->mob = mob;
|
||||
this->speed = speed;
|
||||
this->speedModifier = speedModifier;
|
||||
setRequiredControlFlags(Control::MoveControlFlag);
|
||||
}
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ bool PlayGoal::canUse()
|
|||
double distSqr = friendV->distanceToSqr(mob->shared_from_this());
|
||||
if (distSqr > closestDistSqr) continue;
|
||||
closestDistSqr = distSqr;
|
||||
followFriend = weak_ptr<Mob>(friendV);
|
||||
followFriend = weak_ptr<LivingEntity>(friendV);
|
||||
}
|
||||
delete children;
|
||||
|
||||
|
|
@ -64,7 +64,7 @@ void PlayGoal::start()
|
|||
void PlayGoal::stop()
|
||||
{
|
||||
mob->setChasing(false);
|
||||
followFriend = weak_ptr<Mob>();
|
||||
followFriend = weak_ptr<LivingEntity>();
|
||||
}
|
||||
|
||||
void PlayGoal::tick()
|
||||
|
|
@ -72,7 +72,7 @@ void PlayGoal::tick()
|
|||
--playTime;
|
||||
if (followFriend.lock() != NULL)
|
||||
{
|
||||
if (mob->distanceToSqr(followFriend.lock()) > 2 * 2) mob->getNavigation()->moveTo(followFriend.lock(), speed);
|
||||
if (mob->distanceToSqr(followFriend.lock()) > 2 * 2) mob->getNavigation()->moveTo(followFriend.lock(), speedModifier);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -80,7 +80,7 @@ void PlayGoal::tick()
|
|||
{
|
||||
Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 16, 3);
|
||||
if (pos == NULL) return;
|
||||
mob->getNavigation()->moveTo(pos->x, pos->y, pos->z, speed);
|
||||
mob->getNavigation()->moveTo(pos->x, pos->y, pos->z, speedModifier);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue