Remove characteristics from kart

This commit is contained in:
Flakebi
2015-11-29 04:03:48 +01:00
parent 9fbe72b3c5
commit aea68a2c14
30 changed files with 176 additions and 235 deletions

View File

@@ -25,8 +25,8 @@
#include "graphics/shaders.hpp"
#include "items/powerup_manager.hpp"
#include "items/attachment.hpp"
#include "karts/abstract_characteristic.hpp"
#include "karts/abstract_kart.hpp"
#include "karts/kart_properties.hpp"
#include "karts/controller/controller.hpp"
#include "modes/world.hpp"
#include "physics/irr_debug_drawer.hpp"
@@ -137,14 +137,14 @@ void addAttachment(Attachment::AttachmentType type)
if (type == Attachment::ATTACH_ANVIL)
{
kart->getAttachment()
->set(type, kart->getCharacteristic()->getAnvilDuration());
kart->adjustSpeed(kart->getCharacteristic()->getAnvilSpeedFactor());
->set(type, kart->getKartProperties()->getAnvilDuration());
kart->adjustSpeed(kart->getKartProperties()->getAnvilSpeedFactor());
kart->updateWeight();
}
else if (type == Attachment::ATTACH_PARACHUTE)
{
kart->getAttachment()
->set(type, kart->getCharacteristic()->getParachuteDuration());
->set(type, kart->getKartProperties()->getParachuteDuration());
}
else if (type == Attachment::ATTACH_BOMB)
{