feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict * feat: TU19 (Dec 2014) Features & Content (#32) * December 2014 files * Working release build * Fix compilation issues * Add sound to Windows64Media * Add DLC content and force Tutorial DLC * Revert "Add DLC content and force Tutorial DLC" This reverts commit 97a43994725008e35fceb984d5549df9c8cea470. * Disable broken light packing * Disable breakpoint during DLC texture map load Allows DLC loading but the DLC textures are still broken * Fix post build not working * ... * fix vs2022 build * fix cmake build --------- Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -30,6 +30,33 @@ void GoalSelector::addGoal(int prio, Goal *goal, bool canDeletePointer /*= true*
|
||||
goals.push_back(new InternalGoal(prio, goal, canDeletePointer));
|
||||
}
|
||||
|
||||
void GoalSelector::removeGoal(Goal *toRemove)
|
||||
{
|
||||
for(AUTO_VAR(it, goals.begin()); it != goals.end(); )
|
||||
{
|
||||
InternalGoal *ig = *it;
|
||||
Goal *goal = ig->goal;
|
||||
|
||||
if (goal == toRemove)
|
||||
{
|
||||
AUTO_VAR(it2, find(usingGoals.begin(), usingGoals.end(), ig) );
|
||||
if (it2 != usingGoals.end())
|
||||
{
|
||||
goal->stop();
|
||||
usingGoals.erase(it2);
|
||||
}
|
||||
|
||||
if(ig->canDeletePointer) delete ig->goal;
|
||||
delete ig;
|
||||
it = goals.erase(it);
|
||||
}
|
||||
else
|
||||
{
|
||||
++it;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void GoalSelector::tick()
|
||||
{
|
||||
vector<InternalGoal *> toStart;
|
||||
|
||||
Reference in New Issue
Block a user