[ViewVC] Diff of: cvs/deliantra/server/common/living.C

Comparing deliantra/server/common/living.C (file contents):
Revision 1.102 by root, Wed Nov 11 04:45:22 2009 UTC vs.
Revision 1.108 by root, Fri Mar 26 00:59:20 2010 UTC

 /*
  * 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 (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 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.
 /* Rather than having a whole bunch of if (flag) new_draw.. else new_draw,
  * make this macro to clean those up.  Not usuable outside change_abil
  * 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. */
 /* flag is set to 1 if we are applying the object, -1 if we are removing
  * the object.
                     (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
         }
       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
    * originally undead may change their status
    */
     {
       tmp = present_arch_in_ob (at, this);
       if (!tmp)
         {
-          tmp = arch_to_object (at);
+          tmp = at->instance ();
           tmp = insert_ob_in_ob (tmp, this);
           SET_FLAG (tmp, FLAG_APPLIED);
         }
     }
       if (!tmp)
         {
           if (!value)
             return;
-          tmp = arch_to_object (at);
+          tmp = at->instance ();
           tmp = insert_ob_in_ob (tmp, this);
           SET_FLAG (tmp, FLAG_APPLIED);
         }
       if (value)
   int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
   object *grace_obj = NULL, *mana_obj = NULL, *tmp;
   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)
     {
       contr->delayed_update = false;
                     && !tmp->flag [FLAG_CURSED]
                     && !tmp->flag [FLAG_DAMNED])
                   continue;
               for (int i = 0; i < NUM_STATS; i++)
-                stat_sum [i] = stat_sum [i] + tmp->stats.stat (i);
+                stat_sum [i] += tmp->stats.stat (i);
               if (digest_types [tmp->type])
                 {
                   contr->digestion     += tmp->stats.food;
                   contr->gen_hp        += tmp->stats.hp;
   if (type == PLAYER)
     {
       // clamp various player stats
       for (int i = 0; i < NUM_STATS; ++i)
-        stats.stat (i) = clamp (stat_sum [i], MIN_STAT, MAX_STAT);
+        stats.stat (i) = stat_sum [i];
+      check_stat_bounds (&stats);
       contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
       /* Figure out the players sp/mana/hp totals. */
       int pl_level;
-      check_stat_bounds (&(stats));
-      pl_level = level;
-      if (pl_level < 1)
-        pl_level = 1;           /* safety, we should always get 1 levels worth of hp! */
+      pl_level = max (1, level); /* safety, we should always get 1 levels worth of hp! */
       /* You basically get half a con bonus/level.  But we do take into account rounding,
        * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
        */
       stats.maxhp = 0;
   speed *= speed_reduce_from_disease;
   /* 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)
+  max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
-    speed = 0.04f;
   if (speed != old_speed)
     set_speed (speed);
   if (type == PLAYER)
   if (move_type == 0)
     move_type = MOVE_WALK;
   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.
    */
   if (is_player ())
     contr->update_spells ();
     {
       changed = true;
       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 */
       if (op == who && (who->level < 11) && who->type == PLAYER)
         {

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/living.C (file contents): Revision 1.102 by root, Wed Nov 11 04:45:22 2009 UTC vs. Revision 1.108 by root, Fri Mar 26 00:59:20 2010 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.102 by root, Wed Nov 11 04:45:22 2009 UTC vs.
Revision 1.108 by root, Fri Mar 26 00:59:20 2010 UTC