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

Fix karts without a type

Browse Source
This commit is contained in:
Flakebi 2015-07-24 02:10:23 +02:00
parent 2620a77dc1
commit 324a93cd65
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/karts/abstract_kart.cpp
View File

@ -66,8 +66,13 @@ AbstractKart::AbstractKart(const std::string& ident,
m_characteristic->addCharacteristic(kart_properties_manager-> m_characteristic->addCharacteristic(kart_properties_manager->
getDifficultyCharacteristic(race_manager->getDifficultyAsString( getDifficultyCharacteristic(race_manager->getDifficultyAsString(
race_manager->getDifficulty()))); race_manager->getDifficulty())));
m_characteristic->addCharacteristic(kart_properties_manager->
getKartTypeCharacteristic(m_kart_properties->getKartType())); // Try to get the kart type
const AbstractCharacteristic *characteristic = kart_properties_manager->
getKartTypeCharacteristic(m_kart_properties->getKartType());
if (characteristic)
m_characteristic->addCharacteristic(characteristic);
m_characteristic->addCharacteristic(kart_properties_manager-> m_characteristic->addCharacteristic(kart_properties_manager->
getPlayerCharacteristic(KartProperties::getPerPlayerDifficultyAsString( getPlayerCharacteristic(KartProperties::getPerPlayerDifficultyAsString(
m_difficulty))); m_difficulty)));

13
src/karts/kart_properties.cpp
View File

@ -312,8 +312,17 @@ void KartProperties::combineCharacteristics()
m_combined_characteristic = new CombinedCharacteristic(); m_combined_characteristic = new CombinedCharacteristic();
m_combined_characteristic->addCharacteristic(kart_properties_manager-> m_combined_characteristic->addCharacteristic(kart_properties_manager->
getBaseCharacteristic()); getBaseCharacteristic());
m_combined_characteristic->addCharacteristic(kart_properties_manager->
getKartTypeCharacteristic(m_kart_type)); // Try to get the kart type
const AbstractCharacteristic *characteristic = kart_properties_manager->
getKartTypeCharacteristic(m_kart_type);
if (!characteristic)
Log::warn("KartProperties", "Can't find kart type '%s' for kart '%s'",
m_kart_type.c_str(), m_name.c_str());
else
// Kart type found
m_combined_characteristic->addCharacteristic(characteristic);
m_combined_characteristic->addCharacteristic(m_characteristic); m_combined_characteristic->addCharacteristic(m_characteristic);
} // combineCharacteristics } // combineCharacteristics