From: <hik...@us...> - 2011-10-16 12:29:43
|
Revision: 9997 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=9997&view=rev Author: hikerstk Date: 2011-10-16 12:29:37 +0000 (Sun, 16 Oct 2011) Log Message: ----------- Removed unnecessary parameters kart and track from TrackSector::update. Modified Paths: -------------- main/trunk/src/items/rubber_ball.cpp main/trunk/src/modes/linear_world.cpp main/trunk/src/tracks/track_sector.cpp main/trunk/src/tracks/track_sector.hpp Modified: main/trunk/src/items/rubber_ball.cpp =================================================================== --- main/trunk/src/items/rubber_ball.cpp 2011-10-16 12:17:56 UTC (rev 9996) +++ main/trunk/src/items/rubber_ball.cpp 2011-10-16 12:29:37 UTC (rev 9997) @@ -77,7 +77,7 @@ // initialises the current graph node - TrackSector::update(getXYZ(), kart, m_track); + TrackSector::update(getXYZ()); initializeControlPoints(m_owner->getXYZ()); // At the start the ball aims at quads till it gets close enough to the @@ -354,7 +354,7 @@ next_xyz.setY(new_y); // Determine new distance along track - TrackSector::update(next_xyz, m_owner, m_track); + TrackSector::update(next_xyz); // Ball squashing: // =============== Modified: main/trunk/src/modes/linear_world.cpp =================================================================== --- main/trunk/src/modes/linear_world.cpp 2011-10-16 12:17:56 UTC (rev 9996) +++ main/trunk/src/modes/linear_world.cpp 2011-10-16 12:29:37 UTC (rev 9997) @@ -63,7 +63,7 @@ for(unsigned int n=0; n<kart_amount; n++) { KartInfo info; - info.getSector()->update(m_karts[n]->getXYZ(), m_karts[n], m_track); + info.getSector()->update(m_karts[n]->getXYZ()); m_kart_info.push_back(info); } // next kart @@ -93,7 +93,7 @@ for(unsigned int i=0; i<kart_amount; i++) { m_kart_info[i].reset(); - m_kart_info[i].getSector()->update(m_karts[i]->getXYZ(), m_karts[i], m_track); + m_kart_info[i].getSector()->update(m_karts[i]->getXYZ()); } // next kart // First all kart infos must be updated before the kart position can be @@ -154,7 +154,7 @@ // rescued or eliminated if(kart->playingEmergencyAnimation()) continue; - kart_info.getSector()->update(kart->getXYZ(), kart, m_track); + kart_info.getSector()->update(kart->getXYZ()); } // for n // Update all positions. This must be done after _all_ karts have Modified: main/trunk/src/tracks/track_sector.cpp =================================================================== --- main/trunk/src/tracks/track_sector.cpp 2011-10-16 12:17:56 UTC (rev 9996) +++ main/trunk/src/tracks/track_sector.cpp 2011-10-16 12:29:37 UTC (rev 9997) @@ -47,7 +47,7 @@ * the specified point. * \param xyz The new coordinates to search the graph node for. */ -void TrackSector::update(const Vec3 &xyz, Kart* kart, Track* track) +void TrackSector::update(const Vec3 &xyz) { int prev_sector = m_current_graph_node; Modified: main/trunk/src/tracks/track_sector.hpp =================================================================== --- main/trunk/src/tracks/track_sector.hpp 2011-10-16 12:17:56 UTC (rev 9996) +++ main/trunk/src/tracks/track_sector.hpp 2011-10-16 12:29:37 UTC (rev 9997) @@ -59,7 +59,7 @@ TrackSector(); void reset(); void rescue(); - void update(const Vec3 &xyz, Kart* kart, Track* track); + void update(const Vec3 &xyz); // ------------------------------------------------------------------------ /** Returns how far the the object is from the start line. */ float getDistanceFromStart() const { return m_current_track_coords.getZ();} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |