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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.103 by root, Mon Nov 23 12:19:57 2009 UTC vs.
Revision 1.113 by root, Sun Mar 28 17:04:37 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;
   path_repelled = arch->path_repelled;
   path_denied   = arch->path_denied;
   glow_radius   = arch->glow_radius;
   move_type     = arch->move_type;
-  chosen_skill = 0;
+  object *chosen_skill = 0;
   /* initializing resistances from the values in player/monster's
    * archetype clone
    */
   memcpy (&resist, &arch->resist, sizeof (resist));
   for (int i = 0; i < NROFATTACKS; i++)
     {
       if (resist[i] > 0)
-        prot[i] = resist[i], vuln[i] = 0;
+        prot[i] =  resist[i], vuln[i] = 0;
       else
-        vuln[i] = -(resist[i]), prot[i] = 0;
+        vuln[i] = -resist[i], prot[i] = 0;
-      potion_resist[i] = 0;
+      potion_resist[i] = -1000;
     }
   wc = arch->stats.wc;
   stats.dam = arch->stats.dam;
        * up, etc.
        */
       if ((tmp->flag [FLAG_APPLIED]
            && tmp->type != CONTAINER
            && tmp->type != CLOSE_CON)
-          || (tmp->type == SKILL
-              && tmp->subtype == SK_PRAYING))
+          || (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
         {
           if (type == PLAYER)
             {
               contr->item_power += tmp->item_power;
               if (tmp->type == WEAPON)
                 current_weapon = tmp;
             }
           /* Update slots used for items */
-          if (QUERY_FLAG (tmp, FLAG_APPLIED))
+          if (tmp->flag [FLAG_APPLIED])
             for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
               slot[i].used += tmp->slot[i].info;
           if (tmp->type == SYMPTOM)
-            speed_reduce_from_disease =
-              min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
+            min_it (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
           /* Pos. and neg. protections are counted separate (-> pro/vuln).
            * (Negative protections are calculated exactly like positive.)
            * Resistance from potions are treated special as well. If there's
            * more than one potion-effect, the bigger prot.-value is taken.
            */
-          if (tmp->type != POTION)
+          if (tmp->type == POTION_EFFECT)
-            {
-              for (int i = 0; i < NROFATTACKS; i++)
+            for (int i = 0; i < NROFATTACKS; i++)
-                {
-                  /* Potential for cursed potions, in which case we just can use
-                   * a straight MAX, as potion_resist is initialised to zero.
-                   */
-                  if (tmp->type == POTION_EFFECT)
-                    {
-                      if (potion_resist[i])
-                        potion_resist[i] = max (potion_resist[i], tmp->resist[i]);
-                      else
-                        potion_resist[i] = tmp->resist[i];
+              max_it (potion_resist[i], tmp->resist[i]);
-                    }
+          else if (tmp->type != POTION)
+            for (int i = 0; i < NROFATTACKS; i++)
-                  else if (tmp->resist[i] > 0)
+              if (tmp->resist[i] > 0)
-                    prot[i] += ((100 - prot[i]) *  tmp->resist[i]) / 100;
+                prot[i] += ((100 - prot[i]) *  tmp->resist[i]) / 100;
-                  else if (tmp->resist[i] < 0)
+              else if (tmp->resist[i] < 0)
-                    vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
+                vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
-                }
-            }
           /* There may be other things that should not adjust the attacktype */
           if (tmp->type != SYMPTOM)
             {
               attacktype    |= tmp->attacktype;
                 added_speed += tmp->stats.exp;
             }
           switch (tmp->type)
             {
-#if 0
-              case WAND:
-              case ROD:
-              case HORN:
-                if (type != PLAYER || current_weapon == tmp)
-                  chosen_skill = tmp;
-                break;
-#endif
                 /* skills modifying the character -b.t. */
                 /* for all skills and skill granting objects */
               case SKILL:
                 {
                   if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY)
                   if (tmp->stats.ac)
                     ac -= tmp->stats.ac + tmp->magic;
                   if (settings.spell_encumbrance == TRUE && type == PLAYER)
-                    contr->encumbrance += (int) 3 *tmp->weight / 1000;
+                    contr->encumbrance += 3 * tmp->weight / 1000;
                 }
                 break;
               case SHIELD:
                 if (settings.spell_encumbrance == TRUE && type == PLAYER)
-                  contr->encumbrance += (int) tmp->weight / 2000;
+                  contr->encumbrance += tmp->weight / 2000;
+                //FALLTHROUGH
               case RING:
               case AMULET:
               case GIRDLE:
               case HELMET:
               case BOOTS:
                 if (tmp->stats.ac)
                   ac -= tmp->stats.ac + tmp->magic;
                 break;
+              case WAND:
+              case ROD:
+              case HORN:
+              case SKILL_TOOL:
+                if (type != PLAYER)
+                  chosen_skill = find_skill_by_name (this, tmp->skill);
+                break;
               case BOW:
               case WEAPON:
                 if (type != PLAYER || current_weapon == tmp)
                   {
+                    chosen_skill = find_skill_by_name (this, tmp->skill);
                     wc -= tmp->stats.wc + tmp->magic;
                     if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
                       ac -= tmp->stats.ac + tmp->magic;
                 break;
             }                   /* switch tmp->type */
         }                       /* item is equipped */
     }                           /* for loop of items */
+  if (type != PLAYER)
+    this->chosen_skill = chosen_skill;
   glow_radius = min (glow_radius, MAX_LIGHT_RADIUS);
   /* We've gone through all the objects the player has equipped.  For many things, we
    * have generated intermediate values which we now need to assign.
    */
    */
   for (int i = 0; i < NROFATTACKS; i++)
     {
       resist[i] = prot[i] - vuln[i];
-      if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0)))
+      if (potion_resist[i] != -1000
+          && (potion_resist[i] > resist[i] || potion_resist[i] < 0))
         resist[i] = potion_resist[i];
     }
   if (type == PLAYER)
     {
   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.103 by root, Mon Nov 23 12:19:57 2009 UTC vs. Revision 1.113 by root, Sun Mar 28 17:04:37 2010 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.103 by root, Mon Nov 23 12:19:57 2009 UTC vs.
Revision 1.113 by root, Sun Mar 28 17:04:37 2010 UTC