From 496cb85b01d1565f0b1a6c614b3ce983c3515fbe Mon Sep 17 00:00:00 2001 From: scrawl Date: Sat, 28 May 2016 20:25:55 +0200 Subject: [PATCH] Do not cancel Ai packages when on loading (Fixes #3409) This piece of code was an attempt to fix up save games made before commit d3b76b70063da765b107a766142a681bd7ad5f73 , but ended up introducing a new bug. --- apps/openmw/mwmechanics/aisequence.cpp | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp index 9f6b71db5..13c368f74 100644 --- a/apps/openmw/mwmechanics/aisequence.cpp +++ b/apps/openmw/mwmechanics/aisequence.cpp @@ -409,21 +409,6 @@ void AiSequence::readState(const ESM::AiSequence::AiSequence &sequence) if (!package.get()) continue; - // remove previous packages if required - if (package->shouldCancelPreviousAi()) - { - for(std::list::iterator it = mPackages.begin(); it != mPackages.end();) - { - if((*it)->canCancel()) - { - delete *it; - it = mPackages.erase(it); - } - else - ++it; - } - } - mPackages.push_back(package.release()); } }