fs2open: trunk r11319

Author Committer Branch Timestamp Parent
MageKing17 trunk 2015-04-22 17:49 Pending
Changeset Fix minor problem with weapons.cpp.

If "@Laser Color2:" is defined for a weapon and you override that weapon with a modular table (even if that override entry doesn't actually contain any data), the weapon's laser_color_2 value would get defaulted to its laser_color_1 value. Now, only do that if changing laser_color_1 and the RGB values of the two colors matched before.
mod - /trunk/fs2_open/code/weapon/weapons.cpp Diff File