--- deliantra/server/common/loader.C	2011/05/01 16:58:15	1.169
+++ deliantra/server/common/loader.C	2012/01/27 22:00:39	1.173
@@ -1,7 +1,7 @@
 /*
  * 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
  * 
@@ -552,7 +552,6 @@
 object::parse_kv (object_thawer &f)
 {
   object *op_inv = inv;
-  key_value *last_kv = kv.first;
 
   for (;;)
     {
@@ -749,74 +748,11 @@
           case KW_move_off:             set_move (move_off  , f); break;
           case KW_move_slow:            set_move (move_slow , f); break;
 
-            /* These are all legacy - any new objects should use the move_ .. values */
-          case KW_no_pass:
-            {
-              if (f.get_sint32 ())
-                move_block = MOVE_ALL;
-              else
-                move_block = 0;
-            }
-
-            break;
-
-            /* These are all legacy - any new objects should use the move_ .. values */
-          case KW_walk_on:
-            {
-              if (f.get_sint32 ())
-                move_on |= MOVE_WALK;
-              else
-                move_on &= ~MOVE_WALK;
-            }
-
-            break;
-
-            /* These are all legacy - any new objects should use the move_ .. values */
-          case KW_walk_off:
-            {
-              if (f.get_sint32 ())
-                move_off |= MOVE_WALK;
-              else
-                move_off &= ~MOVE_WALK;
-            }
-            break;
-
-            /* These are all legacy - any new objects should use the move_ .. values */
-          case KW_fly_on:
-            {
-              if (f.get_sint32 ())
-                move_on |= MOVE_FLY_LOW;
-              else
-                move_on &= ~MOVE_FLY_LOW;
-            }
-            break;
-
-            /* These are all legacy - any new objects should use the move_ .. values */
-          case KW_fly_off:
-            {
-              if (f.get_sint32 ())
-                move_off |= MOVE_FLY_LOW;
-              else
-                move_off &= ~MOVE_FLY_LOW;
-            }
-            break;
-
             //TODO: remove these after converting archetypes
           case KW_can_use_wand:
             GET_FLAG (this, FLAG_USE_RANGE);
             break;
 
-            /* These are all legacy - any new objects should use the move_ .. values */
-          case KW_flying:
-            {
-              if (f.get_sint32 ())
-                move_type |= MOVE_FLY_LOW;
-              else
-                move_type &= ~MOVE_FLY_LOW;
-            }
-            break;
-
-
           case KW_identified:
             GET_FLAG (this, FLAG_IDENTIFIED);
             //TODO: move to check_object or so
@@ -858,6 +794,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;
@@ -1132,7 +1069,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,