ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a challenge for the Gnu kart, put it in a new

Browse Source 
group ('special'). Additionally, groups are now only
shown if there is at least one (unlocked) kart in it,
so it becomes only visible after unlocking the Gnu
kart. Putting it in its own group means the AI will
not use this kart (see r3014 on 0.6 branch).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3015 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2009-01-21 01:13:15 +00:00
parent 219c28dba6
commit e6ff1e8e52
2 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/gui/char_sel.cpp
View File

@ -79,6 +79,32 @@ CharSel::CharSel(int whichPlayer)
if (m_player_index == 0)
kart_properties_manager->clearAllSelectedKarts();
// Determine the list of all groups to display. A call to
// kart_properties_manager->getAllGroups() will return even groups without
// karts in it (e.g. because all karts are locked), so in this case we
// don't want to display this list.
m_all_groups = kart_properties_manager->getAllGroups();
std::vector<std::string>::iterator it = m_all_groups.begin();
while(it!=m_all_groups.end())
{
const std::vector<int> &kig=kart_properties_manager->getKartsInGroup(*it);
bool can_be_deleted=true;
for(unsigned int i=0; i<kig.size(); i++)
{
const KartProperties *k=kart_properties_manager->getKartById(kig[i]);
if(!unlock_manager->isLocked(k->getIdent()))
{
can_be_deleted=false;
break;
} // if isLocked
} // for i<kig.size
if(can_be_deleted)
it=m_all_groups.erase(it);
else
it++;
}
if (m_player_index < (int)kart_properties_manager->getNumSelectedKarts())
kart_properties_manager->removeLastSelectedKart();
@ -210,8 +236,7 @@ void CharSel::updateScrollPosition()
}
else
{
const std::vector<std::string> &groups=kart_properties_manager->getAllGroups();
widget_manager->setWgtText(WTOK_NAME0+i, groups[-indx-1]);
widget_manager->setWgtText(WTOK_NAME0+i, m_all_groups[-indx-1]);
widget_manager->hideWgtTexture(WTOK_RACER0 + i);
widget_manager->hideWgtRect(WTOK_RACER0 + i);
}
@ -239,11 +264,10 @@ void CharSel::switchGroup()
// Now add the groups, indicated by a negative number as kart index
// ----------------------------------------------------------------
const std::vector<std::string> groups=kart_properties_manager->getAllGroups();
for(int i =0; i<(int)groups.size(); i++)
for(int i =0; i<(int)m_all_groups.size(); i++)
{
// Only add groups other than the current one
if(groups[i]!=user_config->m_kart_group) m_index_avail_karts.push_back(-i-1);
if(m_all_groups[i]!=user_config->m_kart_group) m_index_avail_karts.push_back(-i-1);
}
if(m_index_avail_karts.size()>=m_max_entries)
{
@ -501,7 +525,7 @@ void CharSel::select()
int kart_id = m_index_avail_karts[token];
if(kart_id < 0) // group selected
{
user_config->m_kart_group = kart_properties_manager->getAllGroups()[-kart_id-1];
user_config->m_kart_group = m_all_groups[-kart_id-1];
switchGroup();
// forces redraw of the model, otherwise (if m_current_kart=0) the new
// model would not be displayed.

26
src/gui/char_sel.hpp
View File

@ -17,8 +17,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef HEADER_CHARSEL_H
#define HEADER_CHARSEL_H
#ifndef HEADER_CHAR_SEL_HPP
#define HEADER_CHAR_SEL_HPP
#include <vector>
#include "base_gui.hpp"
@ -29,17 +29,21 @@ class ssgContext;
class CharSel: public BaseGUI
{
private:
ssgContext *m_context;
ssgTransform *m_kart;
int m_current_kart;
float m_clock;
int m_player_index;
int m_offset; // index of first racer displayed
unsigned int m_num_entries; // number of entries to display
ssgContext *m_context;
ssgTransform *m_kart;
int m_current_kart;
float m_clock;
int m_player_index;
int m_offset; // index of first racer displayed
unsigned int m_num_entries; // number of entries to display
/** Helps to switch off the displayed text once only. */
bool m_first_frame;
std::vector<int> m_index_avail_karts;
bool m_first_frame;
std::vector<int> m_index_avail_karts;
/** List of all groups, but excluding empty groups (e.g. groups with all
* karts still locked. */
std::vector<std::string> m_all_groups;
static const unsigned int m_max_entries=7;
void updateScrollPosition();
int computeIndent(int n) {return 40+abs((int)(m_max_entries-1)/2 - n)*3;}
void switchGroup();