Bugfix: after using the pre-allocated collectables, the kart

would get the same number of collectables again.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1871 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/collectable.cpp

@@ -30,11 +30,11 @@
 Collectable::Collectable(Kart* kart_)
 {
     m_owner  = kart_;
-    clear();
+    reset();
 }   // Collectable
 
 //-----------------------------------------------------------------------------
-void Collectable::clear()
+void Collectable::reset()
 {
     if(race_manager->getRaceMode()==RaceManager::RM_TIME_TRIAL)
     {
@@ -46,7 +46,8 @@ void Collectable::clear()
         m_type   = COLLECT_NOTHING;
         m_number = 0;
     }
-}   // clear
+}   // reset
+
 //-----------------------------------------------------------------------------
 void Collectable::set(CollectableType type, int n)
 {
@@ -136,7 +137,8 @@ void Collectable::use()
 
     if ( m_number <= 0 )
     {
-        clear();
+        m_number = 0;
+        m_type   = COLLECT_NOTHING;
     }
 }   // use
 

src/collectable.hpp

@@ -36,7 +36,7 @@ protected:
 public:
                     Collectable  (Kart* kart_);
     void            set          (CollectableType _type, int n=1);
-    void            clear        ();
+    void            reset        ();
     int             getNum       () const {return m_number;}
     CollectableType getType      () const {return m_type;  }
     void            hitRedHerring(int n);

src/kart.cpp

@@ -289,7 +289,7 @@ void Kart::reset()
     Moveable::reset();
 
     m_attachment.clear();
-    m_collectable.clear();
+    m_collectable.reset();
 
     m_race_lap             = -1;
     m_lap_start_time       = -1.0f;