Move player hog form untransformation into a fineff (Kirke)

For consistency it seems better to print the "Hogs revert"
message before the player transforms.

1 files changed, 10 insertions, 0 deletions

diff --git a/crawl-ref/source/fineff.cc b/crawl-ref/source/fineff.cc
index caca413504..83f4277f6f 100644
--- a/crawl-ref/source/fineff.cc
+++ b/crawl-ref/source/fineff.cc
@@ -18,6 +18,7 @@
 #include "ouch.h"
 #include "religion.h"
 #include "state.h"
+#include "transform.h"
 #include "view.h"
 
 void final_effect::schedule()
@@ -298,6 +299,15 @@ void delayed_action_fineff::fire()
     add_daction(action);
 }
 
+void kirke_death_fineff::fire()
+{
+    delayed_action_fineff::fire();
+
+    // Revert the player last
+    if (you.form == TRAN_PIG)
+        untransform();
+}
+
 // Effects that occur after all other effects, even if the monster is dead.
 // For example, explosions that would hit other creatures, but we want
 // to deal with only one creature at a time, so that's handled last.