warning fixes for CombatState.cpp
Combat spells and cooldowns
merge