From 55231bb8d3e1a4e2752ac3d444c4287eb0ca4e8b Mon Sep 17 00:00:00 2001 From: void_17 <61356189+void2012@users.noreply.github.com> Date: Fri, 6 Mar 2026 02:11:18 +0700 Subject: Remove AUTO_VAR macro and _toString function (#592) --- .../Common/Tutorial/ProcedureCompoundTask.cpp | 69 ++++++---------------- 1 file changed, 19 insertions(+), 50 deletions(-) (limited to 'Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.cpp') diff --git a/Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.cpp b/Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.cpp index 8603f765..0e3b3e37 100644 --- a/Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.cpp +++ b/Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.cpp @@ -3,8 +3,8 @@ ProcedureCompoundTask::~ProcedureCompoundTask() { - for(AUTO_VAR(it, m_taskSequence.begin()); it < m_taskSequence.end(); ++it) - { + for (auto it = m_taskSequence.begin(); it < m_taskSequence.end(); ++it) + { delete (*it); } } @@ -24,10 +24,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) - { - TutorialTask *task = *it; + for (auto& task : m_taskSequence) + { if(!task->isCompleted()) { task->setAsCurrentTask(true); @@ -50,10 +48,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) + for(auto& task : m_taskSequence) { - TutorialTask *task = *it; if(!task->isCompleted()) { promptId = task->getPromptId(); @@ -69,11 +65,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) + for(auto& task : m_taskSequence) { - TutorialTask *task = *it; - if(allCompleted && isCurrentTask) { if(task->isCompleted()) @@ -99,11 +92,9 @@ bool ProcedureCompoundTask::isCompleted() if(allCompleted) { - //Disable all constraints - itEnd = m_taskSequence.end(); - for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) + // Disable all constraints + for(auto& task : m_taskSequence) { - TutorialTask *task = *it; task->enableConstraints(false); } } @@ -113,20 +104,16 @@ bool ProcedureCompoundTask::isCompleted() void ProcedureCompoundTask::onCrafted(shared_ptr item) { - AUTO_VAR(itEnd, m_taskSequence.end()); - for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) + for(auto& task : m_taskSequence) { - 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) + for(auto task : m_taskSequence) { - TutorialTask *task = *it; task->handleUIInput(iAction); } } @@ -135,10 +122,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) + for(auto& task : m_taskSequence) { - TutorialTask *task = *it; if(allCompleted && !task->isCompleted()) { task->setAsCurrentTask(true); @@ -157,10 +142,8 @@ bool ProcedureCompoundTask::ShowMinimumTime() return false; bool showMinimumTime = false; - AUTO_VAR(itEnd, m_taskSequence.end()); - for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) + for(auto& task : m_taskSequence) { - TutorialTask *task = *it; if(!task->isCompleted()) { showMinimumTime = task->ShowMinimumTime(); @@ -176,10 +159,8 @@ bool ProcedureCompoundTask::hasBeenActivated() return true; bool hasBeenActivated = false; - AUTO_VAR(itEnd, m_taskSequence.end()); - for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) + for(auto& task : m_taskSequence) { - TutorialTask *task = *it; if(!task->isCompleted()) { hasBeenActivated = task->hasBeenActivated(); @@ -191,10 +172,8 @@ bool ProcedureCompoundTask::hasBeenActivated() void ProcedureCompoundTask::setShownForMinimumTime() { - AUTO_VAR(itEnd, m_taskSequence.end()); - for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) + for(auto& task : m_taskSequence) { - TutorialTask *task = *it; if(!task->isCompleted()) { task->setShownForMinimumTime(); @@ -209,10 +188,8 @@ bool ProcedureCompoundTask::AllowFade() return true; bool allowFade = true; - AUTO_VAR(itEnd, m_taskSequence.end()); - for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) + for(auto& task : m_taskSequence) { - TutorialTask *task = *it; if(!task->isCompleted()) { allowFade = task->AllowFade(); @@ -224,40 +201,32 @@ bool ProcedureCompoundTask::AllowFade() void ProcedureCompoundTask::useItemOn(Level *level, shared_ptr 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) + for(auto& task : m_taskSequence) { - TutorialTask *task = *it; task->useItemOn(level, item, x, y, z, bTestUseOnly); } } void ProcedureCompoundTask::useItem(shared_ptr item, bool bTestUseOnly) { - AUTO_VAR(itEnd, m_taskSequence.end()); - for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) + for(auto& task : m_taskSequence) { - TutorialTask *task = *it; task->useItem(item, bTestUseOnly); } } void ProcedureCompoundTask::onTake(shared_ptr item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux) { - AUTO_VAR(itEnd, m_taskSequence.end()); - for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) + for(auto& task : m_taskSequence) { - 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) + for(auto& task : m_taskSequence) { - TutorialTask *task = *it; task->onStateChange(newState); } } \ No newline at end of file -- cgit v1.2.3