--- deliantra/server/common/button.C	2008/04/22 01:06:22	1.45
+++ deliantra/server/common/button.C	2009/01/01 11:41:17	1.50
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -476,7 +476,7 @@
 
                 /* See comment in TRIGGER_BUTTON about move_types */
                 if (((head->move_type & op->move_on) || head->move_type == 0)
-                    && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER)))
+                    && (head->race == op->slaying || (op->slaying == shstr_player && head->type == PLAYER)))
                   {
                     push = 1;
                     break;
@@ -812,7 +812,7 @@
       case 5: // kill all alives
         if (!tmp->flag [FLAG_PRECIOUS])
           {
-            get_archetype ("burnout")->insert_at (tmp, source);
+            archetype::get (shstr_burnout)->insert_at (tmp, source);
             tmp->destroy ();
           }
         break;