Changeset 10664

Timestamp:

01/14/12 19:16:25 (16 months ago)

Author:

auria

Message:

Show summary of challenge when approaching orb

Location:

main/trunk/src

Files:

• challenges/challenge_data.cpp (modified) (7 diffs)
• challenges/challenge_data.hpp (modified) (4 diffs)
• states_screens/race_gui_overworld.cpp (modified) (5 diffs)
• tracks/track.cpp (modified) (1 diff)

main/trunk/src/challenges/challenge_data.cpp

@@ -42 +42 @@
     m_num_laps    = -1;
     m_num_karts   = -1;
-
+    m_position    = -1;
     m_time        = -1.0f;
-    m_track_name  = "";
+    m_track_id  = "";
     m_gp_id       = "";
     m_energy      = -1;
@@ -95 +95 @@
     setName( s.c_str() );
 
-    if(!root->get("description", &s) ) error("description");
-    setChallengeDescription( s.c_str() );
+    //if(!root->get("description", &s) ) error("description");
+    //setChallengeDescription( s.c_str() );
     //std::cout << "    // Challenge description = <" << s.c_str() << ">\n";
 
+    
+    
     if(!root->get("karts", &m_num_karts)  ) error("karts");
 
@@ -125 +127 @@
     if(m_major==RaceManager::MAJOR_MODE_SINGLE)
     {
-        if (!root->get("track",  &m_track_name ))
+        if (!root->get("track",  &m_track_id ))
         {
             error("track");
         }
-        if (track_manager->getTrack(m_track_name) == NULL)
+        if (track_manager->getTrack(m_track_id) == NULL)
         {
             error("track");
@@ -164 +166 @@
     delete root;
 
+    
+    
+    core::stringw description;
+    //I18N: number of laps to race in a challenge
+    description += _("Laps : %i", m_num_laps);
+    description += core::stringw(L"\n");
+    //I18N: number of AI karts in a challenge
+    description += _("AI Karts : %i", m_num_karts - 1);
+    if (m_position > 0)
+    {
+        description += core::stringw(L"\n");
+        //I18N: position required to win in a challenge
+        description += _("Required rank : %i", m_position);
+    }
+    if (m_time > 0)
+    {
+        description += core::stringw(L"\n");
+        //I18N: time required to win a challenge
+        description += _("Time to achieve : %s", StringUtils::timeToString(m_time).c_str());
+    }
+    if (m_energy > 0)
+    {
+        description += core::stringw(L"\n");
+        //I18N: nitro points needed to win a challenge
+        description += _("Collect %i points of nitr", m_energy);
+    }
+    
+    m_challenge_description = description;
 }   // ChallengeData
 
@@ -189 +219 @@
         try
         {
-            track_manager->getTrack(m_track_name);
+            track_manager->getTrack(m_track_id);
         }
         catch(std::exception&)
@@ -271 +301 @@
     {
         race_manager->setMinorMode(m_minor);
-        race_manager->setTrack(m_track_name);
+        race_manager->setTrack(m_track_id);
         race_manager->setDifficulty(m_difficulty);
         race_manager->setNumLaps(m_num_laps);
@@ -299 +329 @@
     World *world = World::getWorld();
     std::string track_name = world->getTrack()->getIdent();
-    if(track_name!=m_track_name                         ) return false;
+    if(track_name!=m_track_id                         ) return false;
     if((int)world->getNumKarts()<m_num_karts            ) return false;
     Kart* kart = world->getPlayerKart(0);

main/trunk/src/challenges/challenge_data.hpp

@@ -62 +62 @@
     float                          m_time;
     std::string                    m_gp_id;
-    std::string                    m_track_name;
+    std::string                    m_track_id;
     int                            m_energy;
     std::string                    m_filename;
@@ -106 +106 @@
         getFeatures() const                    { return m_feature;          }
 
-    void  setChallengeDescription(const irr::core::stringw& d) 
-        {m_challenge_description=d;  }
-
     const irr::core::stringw getChallengeDescription() const 
         {return _(m_challenge_description.c_str()); }
@@ -130 +127 @@
     void  setId(const std::string& s)             { m_id = s;                 }
     
-    const std::string& getTrackName() const        { return m_track_name;     }
+    const std::string& getTrackId() const        { return m_track_id;     }
 
     
@@ -142 +139 @@
                               const irr::core::stringw &user_name);
     
+    
+    RaceManager::MajorRaceModeType getMajorMode()  const { return m_major;      }
+    RaceManager::MinorRaceModeType getMinorMode()  const { return m_minor;      }
+    RaceManager::Difficulty        getDifficulty() const { return m_difficulty; }
+    int                            getNumLaps()    const { return m_num_laps;   }
+    int                            getPosition()   const { return m_position;   }
+    int                            getNumKarts()   const { return m_num_karts;  }
+    float                          getTime()       const { return m_time;       }
+    int                            getEnergy()     const { return m_energy;     }
+    
 };   // ChallengeData
 

main/trunk/src/states_screens/race_gui_overworld.cpp

@@ -42 +42 @@
 #include "race/race_manager.hpp"
 #include "tracks/track.hpp"
+#include "tracks/track_manager.hpp"
 #include "utils/constants.hpp"
 #include "utils/string_utils.hpp"
@@ -244 +245 @@
     
     Track* t = world->getTrack();
+    
+    Vec3 kart_xyz;
     
     // In the first iteration, only draw AI karts, then only draw
@@ -259 +262 @@
             if(kart->getController()->isPlayerController() 
                !=(only_draw_player_kart==1)) continue;
-            const Vec3& xyz = kart->getXYZ();
+            kart_xyz= kart->getXYZ();
             Vec3 draw_at;
-            t->mapPoint2MiniMap(xyz, &draw_at);
+            t->mapPoint2MiniMap(kart_xyz, &draw_at);
             
             core::rect<s32> source(i    *m_marker_rendered_size,
@@ -297 +300 @@
     
     //const std::vector<OverworldChallenge>& challenges = t->getChallengeList();
-    const std::vector<OverworldForceField>& challenges = t->getForceFieldList();
-    
-    for (unsigned int n=0; n<challenges.size(); n++)
+    const std::vector<OverworldForceField>& forcefields = t->getForceFieldList();
+    
+    for (unsigned int n=0; n<forcefields.size(); n++)
     {
         Vec3 draw_at;
-        t->mapPoint2MiniMap(challenges[n].m_position, &draw_at);
+        t->mapPoint2MiniMap(forcefields[n].m_position, &draw_at);
         
         //const ChallengeData* c = unlock_manager->getChallenge(challenges[n].m_challenge_id);
        // bool locked = (m_locked_challenges.find(c) != m_locked_challenges.end());
-        bool locked = challenges[n].m_is_locked;
+        bool locked = forcefields[n].m_is_locked;
         
         const core::rect<s32> source(core::position2d<s32>(0,0),
@@ -318 +321 @@
                                                   dest, source, NULL, NULL, true);
     }
+    
+    
+    // ---- Draw nearby challenge if any
+    const std::vector<OverworldChallenge>& challenges = t->getChallengeList();
+    for (unsigned int n=0; n<challenges.size(); n++)
+    {
+        if ((kart_xyz - Vec3(challenges[n].m_position)).length2_2d() < 20)
+        {
+            core::rect<s32> pos(15,
+                                10, 
+                                15 + UserConfigParams::m_width/2,
+                                10 + GUIEngine::getTitleFontHeight());
+            
+            const ChallengeData* challenge = unlock_manager->getChallenge(challenges[n].m_challenge_id);
+            
+            if (challenge == NULL)
+            {
+                fprintf(stderr, "[RaceGUIOverworld] ERROR: Cannot find challenge <%s>\n",
+                        challenges[n].m_challenge_id.c_str());
+                break;
+            }
+            
+            Track* track = track_manager->getTrack(challenge->getTrackId());
+            if (track == NULL)
+            {
+                fprintf(stderr, "[RaceGUIOverworld] ERROR: Cannot find track <%s>, "
+                        "referenced from challenge <%s>\n",
+                        challenge->getTrackId().c_str(),
+                        challenges[n].m_challenge_id.c_str());
+                break;
+            }
+            
+            gui::ScalableFont* font = GUIEngine::getTitleFont();
+            font->draw(track->getName(), pos, video::SColor(255,255,255,255),
+                       false, true /* vcenter */, NULL);
+            
+            
+            pos.UpperLeftCorner.Y += GUIEngine::getTitleFontHeight();
+            pos.LowerRightCorner.Y = UserConfigParams::m_height;
+            GUIEngine::getFont()->draw(challenge->getChallengeDescription().c_str(),
+                                       pos, video::SColor(255,255,255,255),
+                                       false, false /* vcenter */, NULL);
+            break;
+        }
+    }
+    
 }   // drawGlobalMiniMap
 

main/trunk/src/tracks/track.cpp

@@ -858 +858 @@
                 m_challenges.push_back( OverworldChallenge(xyz, challenge) );
                 
-                Track* t = track_manager->getTrack(c->getTrackName());
+                Track* t = track_manager->getTrack(c->getTrackId());
                 if (t == NULL)
                 {
-                    fprintf(stderr, "[WARNING] Cannot find track named <%s>\n", c->getTrackName().c_str());
+                    fprintf(stderr, "[WARNING] Cannot find track named <%s>\n", c->getTrackId().c_str());
                     continue;
                 }