summaryrefslogtreecommitdiffstats
path: root/src/object/objman.cpp
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2013-12-30 10:51:29 +0100
committerkrzys-h <krzys_h@interia.pl>2013-12-30 10:51:29 +0100
commit3536f1c7cc52792a7d833b4f823aa515dc00d933 (patch)
treecfeeaceeba0caf631f07cccef1fdd0ed467f1dcb /src/object/objman.cpp
parent12e17224b37d7db52545c00fb75c0322e0e5afad (diff)
downloadcolobot-3536f1c7cc52792a7d833b4f823aa515dc00d933.tar.gz
colobot-3536f1c7cc52792a7d833b4f823aa515dc00d933.tar.bz2
colobot-3536f1c7cc52792a7d833b4f823aa515dc00d933.zip
Added CObjectManager::Flush()
Possible fix for #275
Diffstat (limited to 'src/object/objman.cpp')
-rw-r--r--src/object/objman.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/object/objman.cpp b/src/object/objman.cpp
index 0471ebf..131d007 100644
--- a/src/object/objman.cpp
+++ b/src/object/objman.cpp
@@ -30,7 +30,7 @@ CObjectManager::CObjectManager()
{
m_table[i] = nullptr;
}
- usedCount = 0;
+ m_usedCount = 0;
}
CObjectManager::~CObjectManager()
@@ -39,16 +39,16 @@ CObjectManager::~CObjectManager()
bool CObjectManager::AddInstance(CObject* instance)
{
- if (usedCount >= MAX_OBJECTS) return false;
+ if (m_usedCount >= MAX_OBJECTS) return false;
m_table[instance->GetID()] = instance;
- usedCount++;
+ m_usedCount++;
return true;
}
bool CObjectManager::DeleteInstance(CObject* instance)
{
- for (int i = 0; i < usedCount; i++)
+ for (int i = 0; i < m_usedCount; i++)
{
if (m_table[i] == instance)
m_table[i] = nullptr;
@@ -386,3 +386,11 @@ CObject* CObjectManager::CreateObject(Math::Vector pos, float angle, ObjectType
return object;
}
+void CObjectManager::Flush()
+{
+ for (int i = 0; i < MAX_OBJECTS; i++)
+ {
+ m_table[i] = nullptr;
+ }
+ m_usedCount = 0;
+}