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

Rename "title" to "name" in achievements to keep consistency with other xml files such as tracks and karts

Browse Source
This commit is contained in:
Deve 2014-12-27 22:43:25 +01:00
parent a80d449aaf
commit 3e6677b755
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
data/achievements.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<achievements>
<achievement id="1" check-type="all-at-least" reset-type="never"
title="Christoffel Columbus" description="Play every official track at least once." >
name="Christoffel Columbus" description="Play every official track at least once." >
<farm goal="1"/>
<scotland goal="1"/>
<lighthouse goal="1"/>
@ -14,42 +14,42 @@
<jungle goal="1"/>
</achievement>
<achievement id="2" check-type="all-at-least" reset-type="never"
title="Strike!" description="Hit 10 karts with a bowling-ball.">
name="Strike!" description="Hit 10 karts with a bowling-ball.">
<ball goal="10"/>
</achievement>
<achievement id="3" check-type="one-at-least" reset-type="race"
title="Arch Enemy" description="Hit the same kart at least 5 times in one race.">
name="Arch Enemy" description="Hit the same kart at least 5 times in one race.">
<hit goal="5"/>
</achievement>
<achievement id="4" check-type="all-at-least" reset-type="race"
title="Marathoner" description="Make a race with 5 laps or more.">
name="Marathoner" description="Make a race with 5 laps or more.">
<laps goal="5"/>
</achievement>
<achievement id="5" check-type="all-at-least" reset-type="lap"
title="Skid-row" description="Make 5 skidding in a single lap.">
name="Skid-row" description="Make 5 skidding in a single lap.">
<skidding goal="5"/>
</achievement>
<achievement id="6" check-type="all-at-least" reset-type="never"
title="Gold driver" description="Win in all single player modes, against at least 3 opponents.">
name="Gold driver" description="Win in all single player modes, against at least 3 opponents.">
<standard goal="1"/>
<std_timetrial goal="1"/>
<follow_leader goal="1"/>
<opponents goal="3"/>
</achievement>
<achievement id="7" check-type="all-at-least" reset-type="race"
title="Powerup Love" description="Use 10 or more powerups in a race.">
name="Powerup Love" description="Use 10 or more powerups in a race.">
<poweruplover goal="10"/>
</achievement>
<achievement id="8" check-type="all-at-least" reset-type="never"
title="Unstoppable" description="Win 5 single races in a row.">
name="Unstoppable" description="Win 5 single races in a row.">
<wins goal="5"/>
</achievement>
<achievement id="9" check-type="all-at-least" reset-type="race"
title="Banana Lover" description="Collect at least 5 bananas in one race.">
name="Banana Lover" description="Collect at least 5 bananas in one race.">
<banana goal="5"/>
</achievement>
<achievement id="10" secret="yes" check-type="all-at-least" reset-type="race"
title="It's secret" description="Really ... a secret.">
name="It's secret" description="Really ... a secret.">
</achievement>
</achievements>

2
src/achievements/achievement.cpp
View File

@ -200,7 +200,7 @@ void Achievement::check()
{
//show achievement
core::stringw s = StringUtils::insertValues(_("Completed achievement \"%s\"."),
m_achievement_info->getTitle());
m_achievement_info->getName());
MessageQueue::add(MessageQueue::MT_ACHIEVEMENT, s);
// Sends a confirmation to the server that an achievement has been

6
src/achievements/achievement_info.cpp
View File

@ -33,19 +33,19 @@ AchievementInfo::AchievementInfo(const XMLNode * input)
{
m_reset_type = NEVER;
m_id = 0;
m_title = "";
m_name = "";
m_description = "";
m_is_secret = false;
bool all;
all = input->get("id", &m_id ) &&
input->get("title", &m_title ) &&
input->get("name ", &m_name ) &&
input->get("description", &m_description );
if (!all)
{
Log::error("AchievementInfo",
"Not all necessary values for achievement defined.");
Log::error("AchievementInfo",
"ID %d title '%s' description '%s'", m_id, m_title.c_str(),
"ID %d title '%s' description '%s'", m_id, m_name.c_str(),
m_description.c_str());
}

6
src/achievements/achievement_info.hpp
View File

@ -80,7 +80,7 @@ private:
uint32_t m_id;
/** The title of this achievement. */
irr::core::stringw m_title;
irr::core::stringw m_name;
/** The description of this achievement. */
irr::core::stringw m_description;
@ -112,8 +112,8 @@ public:
/** Returns the description of this achievement. */
irr::core::stringw getDescription() const { return m_description; }
// ------------------------------------------------------------------------
/** Returns the title of this achievement. */
irr::core::stringw getTitle() const { return m_title; }
/** Returns the name of this achievement. */
irr::core::stringw getName() const { return m_name; }
// ------------------------------------------------------------------------
bool needsResetAfterRace() const { return m_reset_type == AFTER_RACE; }
// ------------------------------------------------------------------------

4
src/states_screens/online_profile_achievements.cpp
View File

@ -107,7 +107,7 @@ void BaseOnlineProfileAchievements::init()
const Achievement *a = it->second;
if(a->getInfo()->isSecret() && !a->isAchieved())
continue;
ListWidget::ListCell title(a->getInfo()->getTitle(), -1, 2);
ListWidget::ListCell title(a->getInfo()->getName(), -1, 2);
ListWidget::ListCell progress(a->getProgressAsString(), -1, 1);
row.push_back(title);
row.push_back(progress);
@ -177,7 +177,7 @@ void BaseOnlineProfileAchievements::onUpdate(float delta)
AchievementInfo *info =
AchievementsManager::get()->getAchievementInfo(a[i]);
m_achievements_list_widget->addItem(StringUtils::toString(info->getID()),
info->getTitle() );
info->getName() );
}
m_waiting_for_achievements = false;