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

Description of the achievement now pops up when you click on one and some bug fixes.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13663 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
unitraxx 2013-09-11 20:25:13 +00:00
parent fc45d76d27
commit 90b8f6d0fc
5 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/achievements/achievement.cpp
View File

@ -203,7 +203,6 @@ irr::core::stringw MapAchievement::getProgressAsString()
for ( iter = goal_values.begin(); iter != goal_values.end(); ++iter ) {
goal += iter->second;
progress += m_progress_map[iter->first];
Log::info("ach","%s",iter->first.c_str());
}
return StringUtils::toWString(progress) + "/" + StringUtils::toWString(goal);
}

3
src/online/profile.cpp
View File

@ -63,6 +63,7 @@ namespace Online{
m_is_current_user = is_current_user;
m_username = username;
m_has_fetched_friends = false;
m_has_fetched_achievements = false;
m_relation_info = NULL;
m_is_friend = false;
}
@ -100,6 +101,7 @@ namespace Online{
xml->get("user_name", &m_username);
m_cache_bit = true;
m_has_fetched_friends = false;
m_has_fetched_achievements = false;
m_is_current_user = (m_id == CurrentUser::get()->getID());
m_state = S_READY;
}
@ -130,6 +132,7 @@ namespace Online{
}
m_has_fetched_achievements = true;
m_state = S_READY;
Log::info("test","tit");
}
// ============================================================================

1
src/online/profile_manager.cpp
View File

@ -49,6 +49,7 @@ namespace Online{
ProfileManager::ProfileManager()
{
assert(m_max_cache_size > 1);
m_currently_visiting = NULL;
}
// ============================================================================

3
src/states_screens/online_profile_achievements.cpp
View File

@ -22,6 +22,7 @@
#include "guiengine/scalable_font.hpp"
#include "guiengine/screen.hpp"
#include "guiengine/widget.hpp"
#include "states_screens/dialogs/message_dialog.hpp"
#include "states_screens/state_manager.hpp"
#include "states_screens/dialogs/user_info_dialog.hpp"
#include "utils/translation.hpp"
@ -106,7 +107,7 @@ void OnlineProfileAchievements::eventCallback(Widget* widget, const std::string&
{
m_selected_achievement_index = m_achievements_list_widget->getSelectionID();
//new achievementInfoDialog(atoi(m_achievements_list_widget->getSelectionInternalName().c_str())); //FIXME dialog
new MessageDialog(AchievementsManager::get()->getAchievementInfo(atoi(m_achievements_list_widget->getSelectionInternalName().c_str()))->getDescription());
}
} // eventCallback

12
src/states_screens/online_profile_base.cpp
View File

@ -38,7 +38,6 @@ using namespace Online;
OnlineProfileBase::OnlineProfileBase(const char* filename) : Screen(filename)
{
m_visiting_profile = ProfileManager::get()->getVisitingProfile();
} // OnlineProfileBase
// -----------------------------------------------------------------------------
@ -62,27 +61,18 @@ void OnlineProfileBase::loadedFromFile()
// -----------------------------------------------------------------------------
void OnlineProfileBase::beforeAddingWidget()
{
m_visiting_profile = ProfileManager::get()->getVisitingProfile();
}
// -----------------------------------------------------------------------------
void OnlineProfileBase::init()
{
Profile * previous_profile = m_visiting_profile;
m_visiting_profile = ProfileManager::get()->getVisitingProfile();
if(previous_profile->isCurrentUser() != m_visiting_profile->isCurrentUser())
{
GUIEngine::reshowCurrentScreen();
return;
}
Screen::init();
m_overview_tab->setTooltip( _("Overview") );
m_friends_tab->setTooltip( _("Friends") );
m_achievements_tab->setTooltip( _("Achievements") );
if (m_visiting_profile->isCurrentUser())
m_header->setText(_("Your profile"), false);
else