mirror of
https://github.com/phoboslab/wipeout-rewrite
synced 2024-12-26 09:59:04 +01:00
Fix ebolt thrust effect on player being frame rate dependent
This commit is contained in:
parent
f9f7b15263
commit
339f130b94
1 changed files with 7 additions and 6 deletions
|
@ -197,13 +197,18 @@ void ship_player_update_race(ship_t *self) {
|
||||||
|
|
||||||
if (flags_is(self->flags, SHIP_ELECTROED)) {
|
if (flags_is(self->flags, SHIP_ELECTROED)) {
|
||||||
self->ebolt_effect_timer += system_tick();
|
self->ebolt_effect_timer += system_tick();
|
||||||
|
|
||||||
// Yank the ship every 0.1 seconds
|
// Yank the ship every 0.1 seconds
|
||||||
if (self->ebolt_effect_timer > 0.1) {
|
if (self->ebolt_effect_timer > 0.1) {
|
||||||
|
self->ebolt_effect_timer -= 0.1;
|
||||||
if (flags_is(self->flags, SHIP_VIEW_INTERNAL)) {
|
if (flags_is(self->flags, SHIP_VIEW_INTERNAL)) {
|
||||||
// SetShake(2); // FIXME
|
// SetShake(2); // FIXME
|
||||||
}
|
}
|
||||||
self->angular_velocity.y += rand_float(-0.5, 0.5); // FIXME: 60fps
|
self->angular_velocity.y += rand_float(-0.5, 0.5);
|
||||||
self->ebolt_effect_timer -= 0.1;
|
|
||||||
|
if (rand_int(0, 10) == 0) { // approx once per second
|
||||||
|
self->thrust_mag -= self->thrust_mag * 0.25;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -231,10 +236,6 @@ void ship_player_update_race(ship_t *self) {
|
||||||
}
|
}
|
||||||
self->thrust_mag = clamp(self->thrust_mag, 0, self->current_thrust_max);
|
self->thrust_mag = clamp(self->thrust_mag, 0, self->current_thrust_max);
|
||||||
|
|
||||||
if (flags_is(self->flags, SHIP_ELECTROED) && rand_int(0, 80) == 0) {
|
|
||||||
self->thrust_mag -= self->thrust_mag * 0.25; // FIXME: 60fps
|
|
||||||
}
|
|
||||||
|
|
||||||
// Brake
|
// Brake
|
||||||
if (input_state(A_BRAKE_RIGHT)) {
|
if (input_state(A_BRAKE_RIGHT)) {
|
||||||
self->brake_right += SHIP_BRAKE_RATE * system_tick();
|
self->brake_right += SHIP_BRAKE_RATE * system_tick();
|
||||||
|
|
Loading…
Reference in a new issue