--- deliantra/server/common/loader.C	2011/05/07 17:14:41	1.170
+++ deliantra/server/common/loader.C	2012/11/14 06:21:39	1.176
@@ -1,24 +1,24 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
- * 
+ *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
- * 
+ *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
@@ -477,8 +477,6 @@
   // if the object has an animation, try to provide a default face
   if (has_anim ())
     {
-      const animation &anim_ob = anim ();
-
       if (anim_speed)
         // if this item is time-animated, force the last frame
         animate_object (this, 0);
@@ -552,7 +550,6 @@
 object::parse_kv (object_thawer &f)
 {
   object *op_inv = inv;
-  key_value *last_kv = kv.first;
 
   for (;;)
     {
@@ -635,11 +632,11 @@
 
           case KW_animation:
             {
-              this->clr_flag (FLAG_ANIMATE);
+              clr_flag (FLAG_ANIMATE);
               animation_id = 0;
 
-              if (f.has_value () && (animation_id = find_animation (f.get_str ())))
-                this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
+              if (f.has_value () && (animation_id = animation::find (f.get_str ()).number))
+                set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
             }
             break;
 
@@ -795,6 +792,7 @@
           case KW_hitback:              GET_FLAG (this, FLAG_HITBACK); break;
           case KW_startequip:           GET_FLAG (this, FLAG_STARTEQUIP); break;
           case KW_blocksview:           GET_FLAG (this, FLAG_BLOCKSVIEW); break;
+          case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break;
           case KW_undead:               GET_FLAG (this, FLAG_UNDEAD); break;
           case KW_scared:               GET_FLAG (this, FLAG_SCARED); break;
           case KW_unaggressive:         GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
@@ -1069,7 +1067,7 @@
     KW_unpaid,
     KW_can_use_shield,
     KW_no_pick,
-    KW_NULL, // walk_on
+    KW_is_transparent_floor,
     /* 10 */
     KW_NULL, // no_pass
     KW_is_animated,