LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-31 10:47:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: expand AUTO_VAR macro

Browse Source
This commit is contained in:
Tropical
2026-03-29 23:59:05 -05:00
parent a330ecdcbb
commit e45151ae64
201 changed files with 1051 additions and 1055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Minecraft.Client/Platform/Common/Tutorial/ProcedureCompoundTask.cpp
View File

@@ -2,7 +2,7 @@
#include "ProcedureCompoundTask.h"
ProcedureCompoundTask::~ProcedureCompoundTask() {
for (AUTO_VAR(it, m_taskSequence.begin()); it < m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < m_taskSequence.end();
++it) {
delete (*it);
}
@@ -19,8 +19,8 @@ int ProcedureCompoundTask::getDescriptionId() {
// Return the id of the first task not completed
int descriptionId = -1;
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
if (!task->isCompleted()) {
task->setAsCurrentTask(true);
@@ -40,8 +40,8 @@ int ProcedureCompoundTask::getPromptId() {
// Return the id of the first task not completed
int promptId = -1;
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
if (!task->isCompleted()) {
promptId = task->getPromptId();
@@ -56,8 +56,8 @@ bool ProcedureCompoundTask::isCompleted() {
bool allCompleted = true;
bool isCurrentTask = true;
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
if (allCompleted && isCurrentTask) {
@@ -80,7 +80,7 @@ bool ProcedureCompoundTask::isCompleted() {
if (allCompleted) {
// Disable all constraints
itEnd = m_taskSequence.end();
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
task->enableConstraints(false);
}
@@ -90,16 +90,16 @@ bool ProcedureCompoundTask::isCompleted() {
}
void ProcedureCompoundTask::onCrafted(std::shared_ptr<ItemInstance> item) {
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
task->onCrafted(item);
}
}
void ProcedureCompoundTask::handleUIInput(int iAction) {
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
task->handleUIInput(iAction);
}
@@ -107,8 +107,8 @@ void ProcedureCompoundTask::handleUIInput(int iAction) {
void ProcedureCompoundTask::setAsCurrentTask(bool active /*= true*/) {
bool allCompleted = true;
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
if (allCompleted && !task->isCompleted()) {
task->setAsCurrentTask(true);
@@ -123,8 +123,8 @@ bool ProcedureCompoundTask::ShowMinimumTime() {
if (bIsCompleted) return false;
bool showMinimumTime = false;
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
if (!task->isCompleted()) {
showMinimumTime = task->ShowMinimumTime();
@@ -138,8 +138,8 @@ bool ProcedureCompoundTask::hasBeenActivated() {
if (bIsCompleted) return true;
bool hasBeenActivated = false;
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
if (!task->isCompleted()) {
hasBeenActivated = task->hasBeenActivated();
@@ -150,8 +150,8 @@ bool ProcedureCompoundTask::hasBeenActivated() {
}
void ProcedureCompoundTask::setShownForMinimumTime() {
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
if (!task->isCompleted()) {
task->setShownForMinimumTime();
@@ -164,8 +164,8 @@ bool ProcedureCompoundTask::AllowFade() {
if (bIsCompleted) return true;
bool allowFade = true;
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
if (!task->isCompleted()) {
allowFade = task->AllowFade();
@@ -178,8 +178,8 @@ bool ProcedureCompoundTask::AllowFade() {
void ProcedureCompoundTask::useItemOn(Level* level,
std::shared_ptr<ItemInstance> item, int x,
int y, int z, bool bTestUseOnly) {
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
task->useItemOn(level, item, x, y, z, bTestUseOnly);
}
@@ -187,8 +187,8 @@ void ProcedureCompoundTask::useItemOn(Level* level,
void ProcedureCompoundTask::useItem(std::shared_ptr<ItemInstance> item,
bool bTestUseOnly) {
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
task->useItem(item, bTestUseOnly);
}
@@ -197,16 +197,16 @@ void ProcedureCompoundTask::useItem(std::shared_ptr<ItemInstance> item,
void ProcedureCompoundTask::onTake(std::shared_ptr<ItemInstance> item,
unsigned int invItemCountAnyAux,
unsigned int invItemCountThisAux) {
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
task->onTake(item, invItemCountAnyAux, invItemCountThisAux);
}
}
void ProcedureCompoundTask::onStateChange(eTutorial_State newState) {
AUTO_VAR(itEnd, m_taskSequence.end());
for (AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
auto itEnd = m_taskSequence.end();
for (auto it = m_taskSequence.begin(); it < itEnd; ++it) {
TutorialTask* task = *it;
task->onStateChange(newState);
}