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

- centers character in character selection screen properly and in all

Browse Source 
display sizes
 - re-adds the 'make last character the new preselection' feature in character
   selection screen



git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1247 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
thebohemian 2007-09-19 11:02:22 +00:00
parent 3167a86e97
commit f4157b1d41
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/char_sel.cpp
View File

@ -61,6 +61,9 @@ CharSel::CharSel(int whichPlayer)
const int HA = widgetSet -> harray(m_menu_id);
const int ICON_SIZE = 64;
unsigned int lastKartId = user_config->m_player[m_player_index].getLastKartId();
bool skipActivatingLast = false;
for (unsigned int i = 0; i < kart_properties_manager->getNumberOfKarts(); i++)
{
const KartProperties* kp= kart_properties_manager->getKartById(i);
@ -69,7 +72,14 @@ CharSel::CharSel(int whichPlayer)
ICON_SIZE, ICON_SIZE);
widgetSet->activate_widget(C, i, 0);
if (i == kart_properties_manager->getNumberOfKarts() - 1)
if (i == lastKartId)
{
widgetSet->set_active(C);
skipActivatingLast = true;
}
if (!skipActivatingLast &&
i == kart_properties_manager->getNumberOfKarts() - 1)
widgetSet->set_active(C);
}
const int HS2 = widgetSet -> hstack(m_menu_id);
@ -128,10 +138,14 @@ void CharSel::update(float dt)
m_context -> makeCurrent();
glClear(GL_DEPTH_BUFFER_BIT);
// FIXME: A bit hackish...
glViewport ( 0, 0, 800, 320);
m_context -> setFOV ( 45.0f, 45.0f * 320.0f/800.0f ) ;
// Puts the character in the center. Scaling is done by
// applying a big camera FOV.
int w = user_config->m_width;
int h = user_config->m_height;
glViewport ( 0, 0, w, h);
m_context -> setFOV ( 65.0f, 65.0f * h/w ) ;
m_context -> setNearFar ( 0.05f, 1000.0f ) ;
sgCoord cam_pos;