immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a possible bug in CObjectManager::GetObjectByRank (might fix #611)

master
krzys-h 2015-09-07 20:38:25 +02:00
parent b058a6986b
commit 0a59f0a907
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/object/object_manager.cpp
View File

@ -124,10 +124,11 @@ CObject* CObjectManager::GetObjectById(unsigned int id)
CObject* CObjectManager::GetObjectByRank(unsigned int id) CObject* CObjectManager::GetObjectByRank(unsigned int id)
{ {
if (id >= m_objects.size()) return nullptr; auto objects = GetAllObjects();
auto it = m_objects.begin(); auto it = objects.begin();
for (unsigned int i = 0; i < id; i++, ++it); for (unsigned int i = 0; i < id && it != objects.end(); i++, ++it);
return it->second.get(); if (it == objects.end()) return nullptr;
return *it;
} }
CObject* CObjectManager::CreateObject(ObjectCreateParams params) CObject* CObjectManager::CreateObject(ObjectCreateParams params)

5
src/object/object_manager.h
View File

@ -94,6 +94,11 @@ public:
while (m_currentIt != m_endIt && m_currentIt->second == nullptr); while (m_currentIt != m_endIt && m_currentIt->second == nullptr);
} }
bool operator==(const CObjectIteratorProxy& other)
{
return m_currentIt == other.m_currentIt;
}
bool operator!=(const CObjectIteratorProxy& other) bool operator!=(const CObjectIteratorProxy& other)
{ {
return m_currentIt != other.m_currentIt; return m_currentIt != other.m_currentIt;