scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-07 08:15:59 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2632 from EatThePath/fix-freeflight

Browse Source 
Restored retail-like handling of speed during freeflight time.
This commit is contained in:
Goober5000 authored and GitHub committed 2020-08-09 21:34:30 -04:00
2 parents 83d9d352ff 9ec972f9c4
commit b419d3fac5
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
code/weapon/weapons.cpp
+3 -3
View File
@@ -4178,9 +4178,9 @@ void weapon_home(object *obj, int num, float frame_time)
// since free_flight_time can now be 0, guard against that
else if (wip->free_flight_time > 0.0f) {
if (obj->phys_info.speed > max_speed) {
obj->phys_info.speed -= frame_time * (2 / wip->free_flight_time);
} else if ((obj->phys_info.speed < max_speed / (2 / wip->free_flight_time)) && (wip->wi_flags[Weapon::Info_Flags::Homing_heat])) {
obj->phys_info.speed = max_speed / (2 / wip->free_flight_time);
obj->phys_info.speed -= frame_time * 4;
} else if ((obj->phys_info.speed < max_speed / 4) && (wip->wi_flags[Weapon::Info_Flags::Homing_heat])) {
obj->phys_info.speed = max_speed / 4;
}
}
// no free_flight_time, so immediately set desired speed