-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Store armour values in islot_armor to inherit from copy-from
This fixes 2 things: - Stores material_thickness, environmental_protection, and environmental_protection_with_filter inside islot_armor to properly inherit from the copied object. - Workaround for cata::optional, which was causing "proportional" and "relative" to fail, because cata::optional does not implement operator*= and operator+= respectively.
- Loading branch information
Showing
2 changed files
with
93 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters