--- deliantra/server/common/living.C	2009/11/23 12:19:57	1.103
+++ deliantra/server/common/living.C	2010/03/26 00:05:45	1.107
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -264,7 +264,7 @@
  * function since some of the values passed to new_draw_info are hardcoded.
  */
 #define DIFF_MSG(flag, msg1, msg2) \
-    new_draw_info(NDI_UNIQUE, 0, op, (flag>0)?msg1:msg2);
+    new_draw_info (NDI_UNIQUE, 0, op, (flag > 0) ? msg1 : msg2);
 
 /* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */
 
@@ -417,9 +417,6 @@
 
       if (tmp->move_type & MOVE_SWIM)
         DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");
-
-      /* Changing move status may mean you are affected by things you weren't before */
-      check_move_on (op, op);
     }
 
   /* becoming UNDEAD... a special treatment for this flag. Only those not
@@ -609,7 +606,7 @@
 
       if (!tmp)
         {
-          tmp = arch_to_object (at);
+          tmp = at->instance ();
           tmp = insert_ob_in_ob (tmp, this);
           SET_FLAG (tmp, FLAG_APPLIED);
         }
@@ -639,7 +636,7 @@
           if (!value)
             return;
 
-          tmp = arch_to_object (at);
+          tmp = at->instance ();
           tmp = insert_ob_in_ob (tmp, this);
           SET_FLAG (tmp, FLAG_APPLIED);
         }
@@ -766,6 +763,8 @@
   float old_speed = speed;
   int stat_sum [NUM_STATS];
 
+  MoveType move_type; // we use change_move_type to change it, so use a local copy
+
   /* First task is to clear all the values back to their original values */
   if (type == PLAYER)
     {
@@ -1358,8 +1357,7 @@
   /* Put a lower limit on speed.  Note with this speed, you move once every
    * 25 ticks or so. This amounts to once every 3 seconds of realtime.
    */
-  if (speed < 0.04f && type == PLAYER)
-    speed = 0.04f;
+  max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
 
   if (speed != old_speed)
     set_speed (speed);
@@ -1404,6 +1402,10 @@
   else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
     move_type &= ~MOVE_WALK;
 
+  // now apply the new move_type
+  if (this->move_type != move_type)
+    change_move_type (move_type);
+
   /* It is quite possible that a player's spell costing might have changed,
    * so we will check that now.
    */
@@ -1608,7 +1610,7 @@
 
       op->level++;
 
-      if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who))
+      if (op && op == who && op->stats.exp > 1 && who->is_dragon ())
         dragon_level_gain (who);
 
       /* Only roll these if it is the player (who) that gained the level */