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

One more fix for singleplayer

Browse Source
This commit is contained in:
Flakebi
2014-09-12 23:04:06 +02:00
parent f02c4403e2
commit cc60fe817b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/guiengine/widgets/player_kart_widget.cpp
View File

@@ -589,7 +589,7 @@ GUIEngine::EventPropagation PlayerKartWidget::transmitEvent(Widget* w,
// Add badge for per player difficulty if necessary
m_model_view->unsetBadge(ZIPPER_BADGE);
m_model_view->unsetBadge(ANCHOR_BADGE);
if (!m_parent_screen->m_from_overworld && (m_parent_screen->m_multiplayer || !profile->isSingleplayerDifficulty()))
if (!m_parent_screen->m_from_overworld && (m_parent_screen->m_multiplayer || profile->isSingleplayerDifficulty()))
{
PerPlayerDifficulty difficulty = profile->getDifficulty();
if (difficulty < PLAYER_DIFFICULTY_NORMAL)

5
src/states_screens/kart_selection.cpp
View File

@@ -508,9 +508,10 @@ bool KartSelectionScreen::joinPlayer(InputDevice* device, bool first_player)
newPlayerWidget->add();
// Add badge for per player difficulty if necessary
if (!m_from_overworld && (m_multiplayer || !profile_to_use->isSingleplayerDifficulty()))
if (!m_from_overworld && (m_multiplayer || profile_to_use->isSingleplayerDifficulty()))
{
PerPlayerDifficulty difficulty = profile_to_use->getDifficulty();
Log::info("From overworld", "%d", difficulty);
if (difficulty < PLAYER_DIFFICULTY_NORMAL)
m_kart_widgets[new_player_id].m_model_view->setBadge(ZIPPER_BADGE);
else if (difficulty > PLAYER_DIFFICULTY_NORMAL)
@@ -1191,7 +1192,7 @@ void KartSelectionScreen::allPlayersDone()
race_manager->setLocalKartInfo(n, selected_kart);
// Set per player difficulty if needed
const PlayerProfile* profile = StateManager::get()->getActivePlayerProfile(n);
if (!m_from_overworld && (m_multiplayer || !profile->isSingleplayerDifficulty()))
if (!m_from_overworld && (m_multiplayer || profile->isSingleplayerDifficulty()))
race_manager->setPlayerDifficulty(n, profile->getDifficulty());
}