changes during the attack and the monster is about to die, so that you don't get Okawaru piety for killing an ally just before you receive the penance. Fixes [2436051].
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8925 c06c8d41-db1a-0410-9941-cceddc491573
MACQITZTGQEWIRQWNC7G46R4QUFSLGQ7ATERWEHAFRA66AS2XICQC VYKBLO2BCJ4IAVQCC5S4R3U3GXQBKWR3YBKQH4HH5TH3KYHTTCJAC JYEEOUYQ7ZPKOGWUV7VCORBVSOLF2UCBFBH3TR75RGOSS6PNKYUAC K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC I2B33Z7NZGC33AMDSSK446AZZYWKPHWLAGULVHKKZU4MVB4BNJOAC R22TTMI6WXWULC7ODKFF3QCB7MOTETQQ6IR4BUCUPOCQKQNCTT5AC IHLGRQOXBGZE3COMNKBKMIDQPJ7HRY4PT74ZUN7HD4ADDPDOX2NQC P5TRGRH7XMQSPCZKM5IEEO34TY6WMLGHHX7BU6Y453JFRXLUR2VQC OSRZEPPGBIMSZBWIVBTZTTIMV6TEUGVZRZ5AI2ZJW7CVZZQBUIMQC RPOZZWKG5GLPHVZZ7ZKMKS64ZMV2LDCQSARBJFJ6FZOTOKCQO7FAC 5K2ANIEXD3CPJM4XNKNPZINP2G4NT7SJBKRN62WNBUKJXFERTILQC C5VA63WAQRWPENIMXRPUPZLZJMC77PL2B3A77HYFWDCZU5QDG7VQC TDE7UVSZX4XJDAQWKCAPZ5IU25C75KKYUHXFI53JRIWHKK5SAGHQC 7YUGK5Q64KG5O7GJGTUBRRLHAHBCJ5YOE23YUPT6UBKUSB67CYAQC // The monster is about to die, so restore its original attitude// for the cleanup effects (god reactions.) This could be a// problem if the "killing" is actually an Abyss banishment - we// don't want to create permafriendlies this way - so don't do it// then.if (monster == defender && killer != KILL_RESET)monster->attitude = defender_starting_attitude;
if (player_monster_visible( monster )){// turn message onmsg_generated = true;switch (wh_enchant){case ENCH_FEAR:simple_monster_message(monster," looks frightened!");break;case ENCH_CONFUSION:simple_monster_message(monster," looks rather confused.");break;case ENCH_CHARM:simple_monster_message(monster," submits to your will.");break;default:// oops, I guess not!msg_generated = false;}
// Do messaging.const char* msg;switch (wh_enchant){case ENCH_FEAR: msg = " looks frightened!"; break;case ENCH_CONFUSION: msg = " looks rather confused."; break;case ENCH_CHARM: msg = " submits to your will."; break;default: msg = NULL; break;