scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-10 17:46:53 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

Trunk Sync r6269. I hope this works. This is supposed to be a Trunk overlay merge into Antipodes, which should mean that Antipodes is now a copy of Trunk in all respects.

Browse Source
This commit is contained in:
Zacam committed 2010-06-29 22:09:34 +00:00
1 parent cfc49b7680
commit 3bebbbbcd0
232 files changed
+57599 -7950
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/object/objcollide.cpp
+7 -5
View File
@@ -753,12 +753,14 @@ int weapon_will_never_hit( object *obj_weapon, object *other, obj_pair * current
float max_vel_weapon, max_vel_other;
max_vel_weapon = wp->weapon_max_vel;
if ((wp->lssm_stage==5))
{
//SUSHI: Fix bug where additive weapon velocity screws up collisions
//Assumes that weapons which don't home don't change speed, which is currently the case.
if (!(wip->wi_flags & WIF_TURNS))
max_vel_weapon = obj_weapon->phys_info.speed;
else if ((wp->lssm_stage==5))
max_vel_weapon = wip->lssm_stage5_vel;
}
else
max_vel_weapon = wp->weapon_max_vel;
max_vel_other = other->phys_info.max_vel.xyz.z;
if (max_vel_other < 10.0f) {