aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/PlayGoal.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.World/PlayGoal.cpp
parenta9be52c41a02d207233199e98898fe7483d7e817 (diff)
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore functionality of the nightly. All in-game menus do not work and generating a world crashes. This reverts commit a9be52c41a02d207233199e98898fe7483d7e817.
Diffstat (limited to 'Minecraft.World/PlayGoal.cpp')
-rw-r--r--Minecraft.World/PlayGoal.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Minecraft.World/PlayGoal.cpp b/Minecraft.World/PlayGoal.cpp
index 6ce3af23..72ee69d4 100644
--- a/Minecraft.World/PlayGoal.cpp
+++ b/Minecraft.World/PlayGoal.cpp
@@ -40,22 +40,22 @@ bool PlayGoal::canUse()
}
delete children;
- if (followFriend.lock() == nullptr)
+ if (followFriend.lock() == NULL)
{
Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 16, 3);
- if (pos == nullptr) return false;
+ if (pos == NULL) return false;
}
return true;
}
bool PlayGoal::canContinueToUse()
{
- return playTime > 0 && followFriend.lock() != nullptr;
+ return playTime > 0 && followFriend.lock() != NULL;
}
void PlayGoal::start()
{
- if (followFriend.lock() != nullptr) mob->setChasing(true);
+ if (followFriend.lock() != NULL) mob->setChasing(true);
playTime = 1000;
}
@@ -68,7 +68,7 @@ void PlayGoal::stop()
void PlayGoal::tick()
{
--playTime;
- if (followFriend.lock() != nullptr)
+ if (followFriend.lock() != NULL)
{
if (mob->distanceToSqr(followFriend.lock()) > 2 * 2) mob->getNavigation()->moveTo(followFriend.lock(), speedModifier);
}
@@ -77,7 +77,7 @@ void PlayGoal::tick()
if (mob->getNavigation()->isDone())
{
Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 16, 3);
- if (pos == nullptr) return;
+ if (pos == NULL) return;
mob->getNavigation()->moveTo(pos->x, pos->y, pos->z, speedModifier);
}
}