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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.97 by elmex, Fri Aug 28 22:19:38 2009 UTC vs.
Revision 1.109 by root, Sun Mar 28 02:53:45 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
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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 GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 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>
  */
 #include <global.h>
 /* 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
    */
 object::drain_specific_stat (int deplete_stats)
 {
   object *tmp;
   archetype *at;
-  at = archetype::find (ARCH_DEPLETION);
+  at = archetype::find (shstr_depletion);
   if (!at)
     {
       LOG (llevError, "Couldn't find archetype depletion.\n");
       return;
     }
     {
       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);
         }
     }
  * via an applied bad_luck object.
  */
 void
 object::change_luck (int value)
 {
-  archetype *at = archetype::find ("luck");
+  archetype *at = archetype::find (shstr_luck);
   if (!at)
     LOG (llevError, "Couldn't find archetype luck.\n");
   else
     {
       object *tmp = present_arch_in_ob (at, this);
       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;
       for (int i = 0; i < NUM_STATS; i++)
         stat_sum [i] = contr->orig_stats.stat (i);
       if (settings.spell_encumbrance == TRUE)
         contr->encumbrance = 0;
   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));
        * 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;
                     && !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;
                 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;
                 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.
    */
   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 (type == PLAYER)
+  if (is_player ())
-    {
+    contr->update_spells ();
-      esrv_update_stats  (contr);
-      esrv_update_spells (contr);
-    }
   // update the mapspace, if we are on a map
   if (!flag [FLAG_REMOVED] && map)
     map->at (x, y).flags_ = 0;
 }
 /*
  * This function is called when a dragon-player gains
  * an overall level. Here, the dragon might gain new abilities
  * or change the ability-focus.
  */
-void
+static void
 dragon_level_gain (object *who)
 {
   object *abil = NULL;          /* pointer to dragon ability force */
   object *skin = NULL;          /* pointer to dragon skin force */
   object *tmp = NULL;           /* tmp. object */
     {
       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)
         {
           new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
         }
     }
   if (changed)
-    {
+    who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
-      who->update_stats ();
-      esrv_update_stats (who->contr);
-      /* check if the spell data has changed */
-      esrv_update_spells (who->contr);
-    }
 }
 /*
  * Returns how much experience is needed for a player to become
  * the given level.  level should really never exceed max_level
  * adjustments based on permanent exp and the like.
  * This function should always be used for losing experience -
  * the 'exp' value passed should be positive - this is the
  * amount that should get subtract from the player.
  */
-sint64
+static sint64
 check_exp_loss (const object *op, sint64 exp)
 {
   sint64 del_exp;
   if (exp > op->stats.exp)
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
     if (tmp->type == SKILL && tmp->stats.exp)
       {
         percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
-        level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)];
+        level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
         /* With the revised exp system, you can get cases where
          * losing several levels would still require that you have more
          * exp than you currently have - this is true if the levels
          * tables is a lot harder.

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.97 by elmex, Fri Aug 28 22:19:38 2009 UTC vs. Revision 1.109 by root, Sun Mar 28 02:53:45 2010 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.97 by elmex, Fri Aug 28 22:19:38 2009 UTC vs.
Revision 1.109 by root, Sun Mar 28 02:53:45 2010 UTC