fix a bug in combat causing crashes
Merge branch 'atlas'