[crawl-ref-commits] SF.net SVN: crawl-ref: [1199] trunk/crawl-ref/source/monstuff.cc

[<ha...@us...>]

Revision: 1199
          http://svn.sourceforge.net/crawl-ref/?rev=1199&view=rev
Author:   haranp
Date:     2007-04-03 07:56:07 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
KILL_MONSTER note now comes before the XP gain (and possible XP_LEVEL
note.)

Modified Paths:
--------------
    trunk/crawl-ref/source/monstuff.cc

Modified: trunk/crawl-ref/source/monstuff.cc
===================================================================
--- trunk/crawl-ref/source/monstuff.cc	2007-04-03 12:54:05 UTC (rev 1198)
+++ trunk/crawl-ref/source/monstuff.cc	2007-04-03 14:56:07 UTC (rev 1199)
@@ -384,6 +384,20 @@
 #ifdef DGL_MILESTONES
     check_kill_milestone(monster, killer, i);
 #endif
+
+    // Take note!
+    if (killer != KILL_RESET && killer != KILL_DISMISSED)
+    {
+        if ( MONST_INTERESTING(monster) ||
+             // XXX yucky hack
+             monster->type == MONS_PLAYER_GHOST ||
+             monster->type == MONS_PANDEMONIUM_DEMON )
+        {
+            take_note(Note(NOTE_KILL_MONSTER, monster->type, 0,
+                           ptr_monam(monster, DESC_NOCAP_A, true)));
+        }
+    }
+
     
     // From time to time Trog gives you a little bonus
     if (killer == KILL_YOU && you.berserker)
@@ -784,15 +798,6 @@
 
     if (killer != KILL_RESET && killer != KILL_DISMISSED)
     {
-        if ( MONST_INTERESTING(monster) ||
-             // XXX yucky hack
-             monster->type == MONS_PLAYER_GHOST ||
-             monster->type == MONS_PANDEMONIUM_DEMON )
-        {
-            take_note(Note(NOTE_KILL_MONSTER, monster->type, 0,
-                           ptr_monam(monster, DESC_NOCAP_A, true)));
-        }
-
         you.kills.record_kill(monster, killer, pet_kill);
 
         if (monster->has_ench(ENCH_ABJ))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.