Merge branch 'For2.2.2-Refactoring' into For2.2.2-Fix-Hourier

diff --cc src/monster-process.c
index 9d050a8,c32e4b5..c7a01cf
--- 1/src/monster-process.c
--- 2/src/monster-process.c
+++ b/src/monster-process.c
@@@ -1290,9 -1112,8 +1112,8 @@@ void process_monster(player_type *targe
  
        process_special(target_ptr, m_idx);
        process_speak_sound(target_ptr, m_idx, oy, ox, aware);
 -      cast_spell(target_ptr, m_idx, aware);
 +      if (cast_spell(target_ptr, m_idx, aware)) return;
  
-       /* Hack -- Assume no movement */
        mm[0] = mm[1] = mm[2] = mm[3] = 0;
        mm[4] = mm[5] = mm[6] = mm[7] = 0;