Merge tag 'colobot-gold-0.1.3-alpha' into debian

1 files changed, 4 insertions, 2 deletions

diff --git a/src/object/objman.h b/src/object/objman.h
index 3087383..390587b 100644
--- a/src/object/objman.h
+++ b/src/object/objman.h
@@ -44,10 +44,12 @@ public:
     //! Seeks for an object
     CObject*  SearchInstance(int id);
     //! Creates an object
-    CObject*  CreateObject(Math::Vector pos, float angle, float zoom, float height, ObjectType type, float power, bool trainer, bool toy, int option);
+    CObject*  CreateObject(Math::Vector pos, float angle, ObjectType type, float power = -1.f, float zoom = 1.f, float height = 0.f, bool trainer = false, bool toy = false, int option = 0);
+    //! Removes all objects
+    void      Flush();
 
 protected:
     CObject* m_table[MAX_OBJECTS];
-    int usedCount;
+    int m_usedCount;
 };