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

Fix bubblegum torque rewind in network

Browse Source
This commit is contained in:
Benau
2018-08-08 13:20:37 +08:00
parent e9945a5d16
commit b4d16799e8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/karts/kart.cpp
View File

@@ -1080,9 +1080,10 @@ void Kart::collectedItem(ItemState *item_state)
// slow down
m_bubblegum_ticks =
stk_config->time2Ticks(m_kart_properties->getBubblegumDuration());
m_bubblegum_torque = ((rand()%2)
? m_kart_properties->getBubblegumTorque()
: -m_kart_properties->getBubblegumTorque());
m_bubblegum_torque =
((World::getWorld()->getTicksSinceStart() / 10) % 2 == 0) ?
m_kart_properties->getBubblegumTorque() :
-m_kart_properties->getBubblegumTorque();
m_max_speed->setSlowdown(MaxSpeed::MS_DECREASE_BUBBLE,
m_kart_properties->getBubblegumSpeedFraction() ,
m_kart_properties->getBubblegumFadeInTicks(),

4
src/karts/kart_rewinder.cpp
View File

@@ -293,6 +293,7 @@ std::function<void()> KartRewinder::getLocalStateRestoreFunction()
bool has_started = m_has_started;
int brake_ticks = m_brake_ticks;
int8_t min_nitro_ticks = m_min_nitro_ticks;
float bubblegum_torque = m_bubblegum_torque;
// Attachment local state
float initial_speed = getAttachment()->getInitialSpeed();
@@ -316,13 +317,14 @@ std::function<void()> KartRewinder::getLocalStateRestoreFunction()
// Skidding local state
float remaining_jump_time = m_skidding->m_remaining_jump_time;
return [has_started, brake_ticks, min_nitro_ticks,
return [has_started, brake_ticks, min_nitro_ticks, bubblegum_torque,
initial_speed, steer_val_l, steer_val_r, current_fraction,
max_speed_fraction, remaining_jump_time, this]()
{
m_has_started = has_started;
m_brake_ticks = brake_ticks;
m_min_nitro_ticks = min_nitro_ticks;
m_bubblegum_torque = bubblegum_torque;
getAttachment()->setInitialSpeed(initial_speed);
PlayerController* pc = dynamic_cast<PlayerController*>(m_controller);
if (pc)