Fixed compile errors from a bad merge.

git-svn-id: svn://svn.icculus.org/fs2open@10408 387891d4-d844-0410-90c0-e4c51a9137d3
Trunk sync r8620.

git-svn-id: svn://svn.icculus.org/fs2open@10409 387891d4-d844-0410-90c0-e4c51a9137d3
Trunk sync r8820.

git-svn-id: svn://svn.icculus.org/fs2open@10410 387891d4-d844-0410-90c0-e4c51a9137d3
Fix for Coverity Issue 1166829: Dereference before null check

git-svn-id: svn://svn.icculus.org/fs2open@10411 387891d4-d844-0410-90c0-e4c51a9137d3
Trunk sync r9021.

git-svn-id: svn://svn.icculus.org/fs2open@10412 387891d4-d844-0410-90c0-e4c51a9137d3
Trunk sync r9420.

git-svn-id: svn://svn.icculus.org/fs2open@10413 387891d4-d844-0410-90c0-e4c51a9137d3
Trunk sync r9620.

git-svn-id: svn://svn.icculus.org/fs2open@10414 387891d4-d844-0410-90c0-e4c51a9137d3
Trunk sync r9820.

git-svn-id: svn://svn.icculus.org/fs2open@10415 387891d4-d844-0410-90c0-e4c51a9137d3
Trunk sync r10020.

git-svn-id: svn://svn.icculus.org/fs2open@10416 387891d4-d844-0410-90c0-e4c51a9137d3
Trunk sync r10134.

git-svn-id: svn://svn.icculus.org/fs2open@10417 387891d4-d844-0410-90c0-e4c51a9137d3
Trunk sync r10135. A difficult merge due to n-seg shields and model point shields being practically impossible to combine. Priority was given to model point shields because they supercede n-seg shields anyway, so the latter is not functional anymore. Also, the code for custom shield segment strengths and recharge percents was based on the n-seg shield code, and will need to be updated.

git-svn-id: svn://svn.icculus.org/fs2open@10418 387891d4-d844-0410-90c0-e4c51a9137d3
Trunk sync r10411.

git-svn-id: svn://svn.icculus.org/fs2open@10419 387891d4-d844-0410-90c0-e4c51a9137d3