cacti no longer spawn outside of desert variants

Cacti have an additional check in cFinishGenSprinkleFoliage to make sure they are in a desert biome variant.

resolves #1629
resolves #1632