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

Fix kart selection confirmation + fix ModelViewWidget::setRotateTo() that was not using the rotation speed

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/christmas@12438 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
funto66 2013-01-29 19:43:40 +00:00
parent c83678801e
commit 5ec7bd3a2d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/guiengine/widgets/model_view_widget.cpp
View File

@ -133,11 +133,11 @@ void ModelViewWidget::update(float delta)
if (distance_with_positive_rotation < distance_with_negative_rotation)
{
angle += delta*(3.0f + std::min(distance_with_positive_rotation, distance_with_negative_rotation)*2.0f);
angle += m_rotation_speed * delta*(3.0f + std::min(distance_with_positive_rotation, distance_with_negative_rotation)*2.0f);
}
else
{
angle -= delta*(3.0f + std::min(distance_with_positive_rotation, distance_with_negative_rotation)*2.0f);
angle -= m_rotation_speed * delta*(3.0f + std::min(distance_with_positive_rotation, distance_with_negative_rotation)*2.0f);
}
if (angle > 360) angle -= 360;
if (angle < 0) angle += 360;
@ -195,4 +195,4 @@ void ModelViewWidget::clearRttProvider()
{
delete m_rtt_provider;
m_rtt_provider = NULL;
}
}

2
src/states_screens/kart_selection.cpp
View File

@ -605,7 +605,7 @@ public:
sfx_manager->quickSound( "wee" );
m_model_view->setRotateTo(30.0f, 150.0f);
m_model_view->setRotateTo(30.0f, 1.0f);
player_id_w *= 2;
player_name_w = 0;

5
src/states_screens/soccer_setup_screen.cpp
View File

@ -35,7 +35,7 @@ using namespace GUIEngine;
DEFINE_SCREEN_SINGLETON( SoccerSetupScreen );
#define KART_CONTINUOUS_ROTATION_SPEED 35.f
#define KART_CONFIRMATION_ROTATION_SPEED 100.f
#define KART_CONFIRMATION_ROTATION_SPEED 4.f
#define KART_CONFIRMATION_TARGET_ANGLE 10.f
// -----------------------------------------------------------------------------
@ -199,6 +199,7 @@ GUIEngine::EventPropagation SoccerSetupScreen::filterActions( PlayerAction acti
break;
}
}
break;
}
case PA_MENU_CANCEL:
{
@ -214,8 +215,8 @@ GUIEngine::EventPropagation SoccerSetupScreen::filterActions( PlayerAction acti
break;
}
}
}
break;
}
default:
break;
}