scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-12 19:06:09 -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/objectshield.cpp
+3 -1
View File
@@ -49,7 +49,9 @@ void shield_add_strength(object *objp, float delta)
if (delta == 0.0f)
return;
if (!(Ai_info[Ships[objp->instance].ai_index].ai_profile_flags & AIPF_SMART_SHIELD_MANAGEMENT))
if (!(Ai_info[Ships[objp->instance].ai_index].ai_profile_flags & AIPF_SMART_SHIELD_MANAGEMENT)
|| delta <= 0.0f) //SUSHI: We don't want smart shield management for negative delta
{
for (int i = 0; i < MAX_SHIELD_SECTIONS; i++)
shield_add_quad(objp, i, delta / MAX_SHIELD_SECTIONS);