diff options
| -rw-r--r-- | src/Entities/Minecart.h | 2 | ||||
| -rw-r--r-- | src/World.cpp | 6 | ||||
| -rw-r--r-- | src/World.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h index 6b6ad36b5..ab906fd06 100644 --- a/src/Entities/Minecart.h +++ b/src/Entities/Minecart.h @@ -127,7 +127,7 @@ public: ContentsWidth = 9, }; - const cItem & GetSlot(int a_Idx) const { return m_Contents.GetSlot(a_Idx); } + const cItem & GetSlot(int a_Idx) const { return m_Contents.GetSlot(a_Idx); } void SetSlot(size_t a_Idx, const cItem & a_Item) { m_Contents.SetSlot(a_Idx, a_Item); } protected: diff --git a/src/World.cpp b/src/World.cpp index 0a0149e97..d147b1c84 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -1073,8 +1073,10 @@ void cWorld::TickScheduledTasks(void) std::find_if( m_ScheduledTasks.begin(), m_ScheduledTasks.end(), - [WorldAge] (std::unique_ptr<cScheduledTask> & Task) { return Task->m_TargetTick < WorldAge;}), - std::back_inserter(Tasks)); + [WorldAge] (cScheduledTaskPtr & Task) { return (Task->m_TargetTick < WorldAge);} + ), + std::back_inserter(Tasks) + ); } // Execute and delete each task: diff --git a/src/World.h b/src/World.h index b2633d863..640aa8bc3 100644 --- a/src/World.h +++ b/src/World.h @@ -861,7 +861,8 @@ private: } }; - typedef std::list<std::unique_ptr<cScheduledTask>> cScheduledTasks; + typedef std::unique_ptr<cScheduledTask> cScheduledTaskPtr; + typedef std::list<cScheduledTaskPtr> cScheduledTasks; AString m_WorldName; |