LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-18 17:48:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove calls to Vec3::newTemp and Vec3::newPermanent

Browse Source
This commit is contained in:
orng
2026-03-26 13:29:05 -05:00
parent bee10e55a8
commit e887c8cf45
63 changed files with 407 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Minecraft.Client/Platform/Common/Tutorial/AreaConstraint.cpp
View File

@@ -25,8 +25,8 @@ AreaConstraint::~AreaConstraint() {
bool AreaConstraint::isConstraintSatisfied(int iPad) {
Minecraft* minecraft = Minecraft::GetInstance();
return messageArea->contains(minecraft->localplayers[iPad]->getPos(1)) ==
contains;
Vec3 ipad_player = minecraft->localplayers[iPad]->getPos(1);
return messageArea->contains(&ipad_player) == contains;
}
bool AreaConstraint::isConstraintRestrictive(int iPad) {

4
Minecraft.Client/Platform/Common/Tutorial/AreaHint.cpp
View File

@@ -24,10 +24,12 @@ AreaHint::~AreaHint() { delete area; }
int AreaHint::tick() {
Minecraft* minecraft = Minecraft::GetInstance();
Vec3 player_pos = minecraft->player->getPos(1);
if ((m_displayState == e_Tutorial_State_Any ||
m_tutorial->getCurrentState() == m_displayState) &&
m_hintNeeded &&
area->contains(minecraft->player->getPos(1)) == contains) {
area->contains(&player_pos) == contains) {
if (m_completeState == e_Tutorial_State_None) {
m_hintNeeded = false;
} else if (m_tutorial->isStateCompleted(m_completeState)) {

5
Minecraft.Client/Platform/Common/Tutorial/ChangeStateConstraint.cpp
View File

@@ -85,8 +85,9 @@ void ChangeStateConstraint::tick(int iPad) {
break;
}
}
Vec3 ipad_player = minecraft->localplayers[iPad]->getPos(1);
if (!m_bHasChanged && inASourceState &&
movementArea->contains(minecraft->localplayers[iPad]->getPos(1)) ==
movementArea->contains(&ipad_player) ==
contains) {
m_bHasChanged = true;
m_changedFromState = m_tutorial->getCurrentState();
@@ -126,7 +127,7 @@ void ChangeStateConstraint::tick(int iPad) {
}
} else if (m_bHasChanged &&
movementArea->contains(
minecraft->localplayers[iPad]->getPos(1)) != contains) {
&ipad_player) != contains) {
m_bHasChanged = false;
m_tutorial->changeTutorialState(m_changedFromState);