search

CleverRaven / Cataclysm-DDA

Cataclysm - Dark Days Ahead. A turn-based survival game set in a post-apocalyptic world.
http://cataclysmdda.org
Other
9.73k stars 4.05k forks source link

Restore lost constant #73472

Closed PatrikLundell closed 2 weeks ago

PatrikLundell commented 2 weeks ago

Summary

None

Purpose of change

master didn't compile because of a missing constant, presumably due to mergers conflicting (e.g. one removing an unused constant while another used the previously unused constant).

Describe the solution

Add/Restore the constant.

Describe alternatives you've considered

Testing

Compilation only, since the error corrected is that 'master' doesn't compile.

Additional context

Brambor commented 2 weeks ago

I assume General build matrix / GCC 9, Curses, LTO will break, since I broke it in #73400

PatrikLundell commented 2 weeks ago

The reason I stumbled upon it was because I had to do a PR conflict resolution. Then the testing kicked off by that failed (I won't bother to check which one), and then I updated my local master copy and saw that it failed too. Hence this PR.