From: <hik...@us...> - 2011-10-16 20:54:56
|
Revision: 10003 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=10003&view=rev Author: hikerstk Date: 2011-10-16 20:54:49 +0000 (Sun, 16 Oct 2011) Log Message: ----------- Removed unused variable. Modified Paths: -------------- main/trunk/src/items/projectile_manager.cpp main/trunk/src/items/rubber_ball.cpp main/trunk/src/items/rubber_ball.hpp Modified: main/trunk/src/items/projectile_manager.cpp =================================================================== --- main/trunk/src/items/projectile_manager.cpp 2011-10-16 16:00:10 UTC (rev 10002) +++ main/trunk/src/items/projectile_manager.cpp 2011-10-16 20:54:49 UTC (rev 10003) @@ -158,10 +158,11 @@ Flyable *f; switch(type) { - case PowerupManager::POWERUP_BOWLING: f = new Bowling(kart); break; - case PowerupManager::POWERUP_PLUNGER: f = new Plunger(kart); break; - case PowerupManager::POWERUP_CAKE: f = new Cake(kart); break; - case PowerupManager::POWERUP_RUBBERBALL: f = new RubberBall(kart, track); break; + case PowerupManager::POWERUP_BOWLING: f = new Bowling(kart); break; + case PowerupManager::POWERUP_PLUNGER: f = new Plunger(kart); break; + case PowerupManager::POWERUP_CAKE: f = new Cake(kart); break; + case PowerupManager::POWERUP_RUBBERBALL: f = new RubberBall(kart); + break; default: return NULL; } m_active_projectiles.push_back(f); Modified: main/trunk/src/items/rubber_ball.cpp =================================================================== --- main/trunk/src/items/rubber_ball.cpp 2011-10-16 16:00:10 UTC (rev 10002) +++ main/trunk/src/items/rubber_ball.cpp 2011-10-16 20:54:49 UTC (rev 10003) @@ -39,12 +39,10 @@ float RubberBall::m_fast_ping_distance; int RubberBall::m_next_id = 0; -RubberBall::RubberBall(Kart *kart, Track* track) +RubberBall::RubberBall(Kart *kart) : Flyable(kart, PowerupManager::POWERUP_RUBBERBALL, 0.0f /* mass */), TrackSector() -{ - m_track = track; - +{ // For debugging purpose: pre-fix each debugging line with the id of // the ball so that it's easy to collect all debug output for one // particular ball only. Modified: main/trunk/src/items/rubber_ball.hpp =================================================================== --- main/trunk/src/items/rubber_ball.hpp 2011-10-16 16:00:10 UTC (rev 10002) +++ main/trunk/src/items/rubber_ball.hpp 2011-10-16 20:54:49 UTC (rev 10003) @@ -151,8 +151,6 @@ /** Sound effect to be played when a ball hits a kart. */ SFXBase *m_hit_sfx; - Track *m_track; - void computeTarget(); void checkDistanceToTarget(); unsigned int getSuccessorToHitTarget(unsigned int node_index, @@ -164,7 +162,7 @@ void initializeControlPoints(const Vec3 &xyz); float getMaxTerrainHeight(const Vec3 &vertical_offset) const; public: - RubberBall (Kart* kart, Track* track); + RubberBall (Kart* kart); virtual ~RubberBall(); static void init(const XMLNode &node, scene::IMesh *bowling); virtual bool updateAndDelete(float dt); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |