TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Reduce ship rocking during countdown

Browse source 
A prior change switched to using the greater, rather than the lesser, of
`16` or `Countdown_seconds_left`, which increased the rotation from the
ship rocking effect.  Switch back to use the lesser value.

Reported-by: zicodxx <https://github.com/dxx-rebirth/dxx-rebirth/issues/431>
Fixes: 644d6fa513 ("Simplify do_countdown_frame ship rocking effect")
This commit is contained in:
Kp 2019-06-28 01:14:36 +00:00
parent 1eaaff3016
commit 75de1c23c1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
similar/main/cntrlcen.cpp
View file

@ -203,7 +203,7 @@ window_event_result do_countdown_frame()
if (d_tick_step)
{
auto &rotvel = ConsoleObject->mtype.phys_info.rotvel;
const auto get_base_disturbance = [fc = std::max(Countdown_seconds_left, 16)]() {
const auto get_base_disturbance = [fc = std::min(Countdown_seconds_left, 16)]() {
return fixmul(d_rand() - 16384, 3 * F1_0 / 16 + (F1_0 * (16 - fc)) / 32);
};
fix disturb_x = get_base_disturbance(), disturb_z = get_base_disturbance();