[Supertuxkart-commit] SF.net SVN: supertuxkart:[5327] main/trunk/src

[<au...@us...>]

Revision: 5327
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=5327&view=rev
Author:   auria
Date:     2010-04-30 20:21:07 +0000 (Fri, 30 Apr 2010)

Log Message:
-----------
Give better diagnostics when trying to use kart rank and it's not set

Modified Paths:
--------------
    main/trunk/src/items/powerup.cpp
    main/trunk/src/karts/kart.cpp

Modified: main/trunk/src/items/powerup.cpp
===================================================================
--- main/trunk/src/items/powerup.cpp	2010-04-30 20:16:35 UTC (rev 5326)
+++ main/trunk/src/items/powerup.cpp	2010-04-30 20:21:07 UTC (rev 5327)
@@ -289,13 +289,12 @@
  */
 void Powerup::hitBonusBox(int n, const Item &item, int add_info)
 {
-    unsigned int position = m_owner->getPosition();
-
+    int position = m_owner->getPosition();
+    assert(position != -1);
+    
     PowerupManager::PowerupType new_powerup = 
         powerup_manager->getRandomPowerup(position);
 
-    World *world = World::getWorld();
-
     if(m_type==PowerupManager::POWERUP_NOTHING)
     {
         set( new_powerup, n );

Modified: main/trunk/src/karts/kart.cpp
===================================================================
--- main/trunk/src/karts/kart.cpp	2010-04-30 20:16:35 UTC (rev 5326)
+++ main/trunk/src/karts/kart.cpp	2010-04-30 20:21:07 UTC (rev 5327)
@@ -90,6 +90,7 @@
     m_saved_controller     = NULL;
 
     m_view_blocked_by_plunger = 0;
+    m_race_position           = -1;
 
     // Initialize custom sound vector (TODO: add back when properly done)
     // m_custom_sounds.resize(SFXManager::NUM_CUSTOMS);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.