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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.77 by root, Tue Aug 7 23:38:12 2007 UTC vs.
Revision 1.93 by root, Thu Dec 18 19:56:09 2008 UTC

 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * You should have received a copy of 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 <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
-#include <funcpoint.h>
 /* Handy little macro that adds exp and keeps it within bounds.  Since
  * we are now using 64 bit values, I'm not all concerned about overflow issues
  * with exptotal wrapping.  exptotal is typically op->exp, or op->perm_exp
  */
  * that gives them that ability.
  */
 int
 change_abil (object *op, object *tmp)
 {
-  int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, success = 0;
+  int flag = tmp->flag [FLAG_APPLIED] ? 1 : -1;
+  int success = 0;
   char message[MAX_BUF];
   int potion_max = 0;
-  /* remember what object was like before it was changed.  note that
+  // keep some stats for comparison purposes
-   * refop is a local copy of op only to be used for detecting changes
+  object::flags_t prev_flag = op->flag;
-   * found by update_stats. refop is not a real object
+  MoveType prev_move_type = op->move_type;
-   */
+  sint16 prev_resist [NROFATTACKS]; // clumsy
-  object_copy refop = *op;
+  assert (sizeof (prev_resist) == sizeof (op->resist));
+  memcpy (prev_resist, op->resist, sizeof (prev_resist));
   if (op->type == PLAYER)
     {
       if (tmp->type == POTION)
         {
           potion_max = 1;
           for (int j = 0; j < NUM_STATS; j++)
             {
               int ostat = op->contr->orig_stats.stat (j);
               int i = tmp->stats.stat (j);
               /* nstat is what the stat will be after use of the potion */
               int nstat = flag * i + ostat;
-              /* Do some bounds checking.  While I don't think any
+              /* Do some bounds checking. There is the potential for potions
-               * potions do so right now, there is the potential for potions
                * that adjust that stat by more than one point, so we need
                * to allow for that.
                */
               if (nstat < 1 && i * flag < 0)
                 nstat = 1;
     {
       success = 1;
       DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red.");
     }
-  if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE))
+  if (op->flag [FLAG_LIFESAVE] != prev_flag [FLAG_LIFESAVE])
     {
       success = 1;
       DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore.");
     }
-  if (QUERY_FLAG (op, FLAG_REFL_MISSILE) != QUERY_FLAG (&refop, FLAG_REFL_MISSILE))
+  if (op->flag [FLAG_REFL_MISSILE] != prev_flag [FLAG_REFL_MISSILE])
     {
       success = 1;
       DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away.");
     }
-  if (QUERY_FLAG (op, FLAG_REFL_SPELL) != QUERY_FLAG (&refop, FLAG_REFL_SPELL))
+  if (op->flag [FLAG_REFL_SPELL] != prev_flag [FLAG_REFL_SPELL])
     {
       success = 1;
       DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow.");
     }
    * user has multiple items giving the same type appled like we
    * used to - that is more work than what we gain, plus messages
    * can be misleading (a little higher could be miscontrued from
    * from fly high)
    */
-  if (tmp->move_type && op->move_type != refop.move_type)
+  if (tmp->move_type && op->move_type != prev_move_type)
     {
       success = 1;
       /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low
        * status doesn't make a difference if you are flying high
        */
       if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH))
         {
-          DIFF_MSG (flag, "You start to float in the air!.", "You float down to the ground.");
+          DIFF_MSG (flag, "You start to float in the air!", "You float down to the ground.");
         }
       if (tmp->move_type & MOVE_FLY_HIGH)
         {
           /* double conditional - second case covers if you have move_fly_low -
     }
   /* becoming UNDEAD... a special treatment for this flag. Only those not
    * originally undead may change their status
    */
-  if (!QUERY_FLAG (op->arch, FLAG_UNDEAD))
+  if (!op->arch->flag [FLAG_UNDEAD])
-    if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD))
+    if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD])
       {
         success = 1;
         if (flag > 0)
           {
             op->race = "undead";
             op->race = op->arch->race;
             new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
           }
       }
-  if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH))
+  if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH])
     {
       success = 1;
       DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
     }
-  if (QUERY_FLAG (op, FLAG_MAKE_INVIS) != QUERY_FLAG (&refop, FLAG_MAKE_INVIS))
+  if (op->flag [FLAG_MAKE_INVIS] != prev_flag [FLAG_MAKE_INVIS])
     {
       success = 1;
       DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
     }
   /* blinded you can tell if more blinded since blinded player has minimal
    * vision
    */
-  if (QUERY_FLAG (tmp, FLAG_BLIND))
+  if (tmp->flag [FLAG_BLIND])
     {
       success = 1;
       if (flag > 0)
         {
-          if (QUERY_FLAG (op, FLAG_WIZ))
+          if (op->flag [FLAG_WIZ])
             new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded.");
           else
             {
               new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
               SET_FLAG (op, FLAG_BLIND);
                 op->contr->do_los = 1;
             }
         }
       else
         {
-          if (QUERY_FLAG (op, FLAG_WIZ))
+          if (op->flag [FLAG_WIZ])
             new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again.");
           else
             {
               new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
               CLEAR_FLAG (op, FLAG_BLIND);
                 op->contr->do_los = 1;
             }
         }
     }
-  if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) != QUERY_FLAG (&refop, FLAG_SEE_IN_DARK))
+  if (op->flag [FLAG_SEE_IN_DARK] != prev_flag [FLAG_SEE_IN_DARK])
     {
       success = 1;
       if (op->type == PLAYER)
         op->contr->do_los = 1;
       DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark.");
     }
-  if (QUERY_FLAG (op, FLAG_XRAYS) != QUERY_FLAG (&refop, FLAG_XRAYS))
+  if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS])
     {
       success = 1;
       if (flag > 0)
         {
-          if (QUERY_FLAG (op, FLAG_WIZ))
+          if (op->flag [FLAG_WIZ])
             new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer.");
           else
             {
               new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");
               if (op->type == PLAYER)
                 op->contr->do_los = 1;
             }
         }
       else
         {
-          if (QUERY_FLAG (op, FLAG_WIZ))
+          if (op->flag [FLAG_WIZ])
             new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus.");
           else
             {
               new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid.");
               if (op->type == PLAYER)
   for (int i = 0; i < NROFATTACKS; i++)
     {
       if (i == ATNR_PHYSICAL)
         continue;               /* Don't display about armour */
-      if (op->resist[i] != refop.resist[i])
+      if (op->resist [i] != prev_resist [i])
         {
           success = 1;
-          if (op->resist[i] > refop.resist[i])
+          if (op->resist [i] > prev_resist [i])
-            sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg[i], op->resist[i]);
+            sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg [i], op->resist [i]);
           else
-            sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg[i], op->resist[i]);
+            sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg [i], op->resist [i]);
           new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);
         }
     }
   if (!potion_max)
-    {
-      for (int j = 0; j < NUM_STATS; j++)
+    for (int j = 0; j < NUM_STATS; j++)
-        {
-          if (int i = tmp->stats.stat (j))
+      if (int i = tmp->stats.stat (j))
-            {
+        {
-              success = 1;
+          success = 1;
-              DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
+          DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
-            }
+        }
-        }
-    }
   return success;
 }
 /*
         continue;
       /* See note in map.c:update_position about making this additive
        * since light sources are never applied, need to put check here.
        */
-      if (tmp->glow_radius > glow_radius)
-        glow_radius = tmp->glow_radius;
+      glow_radius = max (glow_radius, tmp->glow_radius);
       /* For some things, we don't care what is equipped */
       if (tmp->type == SKILL)
         {
           /* Want to take the highest skill here. */
               else if (tmp->level > grace_obj->level)
                 grace_obj = tmp;
             }
         }
-      /* Container objects are not meant to adjust a players, but other applied
+      /* Container objects are not meant to adjust players, but other applied
        * objects need to make adjustments.
        * This block should handle all player specific changes
        * The check for Praying is a bit of a hack - god given bonuses are put
        * in the praying skill, and the player should always get those.
        * It also means we need to put in additional checks for applied below,
               if (digest_types [tmp->type])
                 {
                   contr->digestion     += tmp->stats.food;
                   contr->gen_hp        += tmp->stats.hp;
+                  if (tmp->type != BOW) // ugly exception for bows
-                  contr->gen_sp        += tmp->stats.sp;
+                    contr->gen_sp      += tmp->stats.sp;
                   contr->gen_grace     += tmp->stats.grace;
                   contr->gen_sp_armour += tmp->gen_sp_armour;
                 }
             }                   /* if this is a player */
           else
           if (tmp->type == SYMPTOM)
             speed_reduce_from_disease =
               min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
-          /* Pos. and neg. protections are counted seperate (-> pro/vuln).
+          /* 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)
       /* f is a number the represents the number of kg above (positive num)
        * or below (negative number) that the player is carrying.  If above
        * weight limit, then player suffers a speed reduction based on how
        * much above he is, and what is max carry is
        */
-      f = (carrying / 1000) - max_carry[stats.Str];
+      float f = (carrying / 1000) - max_carry[stats.Str];
-      if (f > 0)
+      if (f > 0.f)
         speed = speed / (1.f + f / max_carry[stats.Str]);
     }
   speed += bonus_speed / 10.f;      /* Not affected by limits */
-  speed = speed * speed_reduce_from_disease;
+  speed *= speed_reduce_from_disease;
   /* Put a lower limit on speed.  Note with this speed, you move once every
-   * 100 ticks or so.  This amounts to once every 12 seconds of realtime.
+   * 25 ticks or so. This amounts to once every 3 seconds of realtime.
    */
-  if (speed < 0.01f && type == PLAYER)
+  if (speed < 0.04f && type == PLAYER)
-    speed = 0.01f;
+    speed = 0.04f;
   if (speed != old_speed)
     set_speed (speed);
   if (type == PLAYER)
 /*
  * set the new dragon name after gaining levels or
  * changing ability focus (later this can be extended to
  * eventually change the player's face and animation)
- *
- * Note that the title is written to 'own_title' in the
- * player struct. This should be changed to 'ext_title'
- * as soon as clients support this!
- * Please, anyone, write support for 'ext_title'.
  */
 void
 set_dragon_name (object *pl, const object *abil, const object *skin)
 {
   int atnr = -1;                /* attacknumber of highest level */
   /* now if there are equals at highest level, pick the one with focus,
      or else at random */
   if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
     atnr = abil->stats.exp;
-  level = (int) (level / 5.);
   /* now set the new title */
-  if (pl->contr != NULL)
-    {
-      if (level == 0)
-        sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
+  if      (level <  25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
-      else if (level == 1)
-        sprintf (pl->contr->title, "%s wyrm", attacks[atnr]);
+  else if (level <  50) sprintf (pl->contr->title, "%s wyrm"     , attacks[atnr]);
-      else if (level == 2)
-        sprintf (pl->contr->title, "%s wyvern", attacks[atnr]);
+  else if (level <  75) sprintf (pl->contr->title, "%s wyvern"   , attacks[atnr]);
-      else if (level == 3)
-        sprintf (pl->contr->title, "%s dragon", attacks[atnr]);
+  else if (level < 100) sprintf (pl->contr->title, "%s dragon"   , attacks[atnr]);
-      else
+  else
-        {
+    {
-          /* special titles for extra high resistance! */
+      /* special titles for extra high resistance! */
-          if (skin->resist[atnr] > 80)
-            sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
+      if      (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
-          else if (skin->resist[atnr] > 50)
-            sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]);
+      else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon"  , attacks[atnr]);
-          else
-            sprintf (pl->contr->title, "big %s dragon", attacks[atnr]);
+      else                              sprintf (pl->contr->title, "big %s dragon"      , attacks[atnr]);
-        }
     }
   strcpy (pl->contr->own_title, "");
 }
   object *skill_obj;
   skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
   if (!skill_obj)
     {
-      LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name);
+      LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
       return NULL;
     }
   /* clear the flag - exp goes into this bucket, but player
    * still doesn't know it.
    */
   CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
   skill_obj->stats.exp = 0;
   skill_obj->level = 1;
-  insert_ob_in_ob (skill_obj, op);
+  op->insert (skill_obj);
   if (player *pl = op->contr)
-    {
+    pl->link_skills ();
-      pl->last_skill_ob [skill_obj->subtype] = skill_obj;
-      if (pl->ns)
-        pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
-    }
   return skill_obj;
 }
 /* player_lvl_adj() - for the new exp system. we are concerned with
  * flag is what to do if the player doesn't have the skill:
  */
 static void
 add_player_exp (object *op, sint64 exp, const char *skill_name, int flag)
 {
-  object *skill_obj = NULL;
+  object *skill_obj;
   sint64 limit, exp_to_add;
   int i;
   /* prevents some forms of abuse. */
   if (op->contr->braced)
   /* Try to find the matching skill.
    * We do a shortcut/time saving mechanism first - see if it matches
    * chosen_skill. This means we don't need to search through
    * the players inventory.
    */
+  skill_obj = 0;
   if (skill_name)
     {
-      if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill))
+      skill_obj = op->contr->find_skill (skill_name);
-        skill_obj = op->chosen_skill;
-      else
-        {
-          for (i = 0; i < NUM_SKILLS; i++)
-            if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
-              {
-                skill_obj = op->contr->last_skill_ob[i];
-                break;
-              }
-          /* Player doesn't have the skill.  Check to see what to do, and give
+      /* Player doesn't have the skill.  Check to see what to do, and give
-           * it to the player if necessary
+       * it to the player if necessary
-           */
+       */
-          if (!skill_obj)
+      if (!skill_obj)
-            {
+        {
-              if (flag == SK_EXP_NONE)
+          if (flag == SK_EXP_NONE)
-                return;
+            return;
-              else if (flag == SK_EXP_ADD_SKILL)
+          if (flag == SK_EXP_ADD_SKILL)
-                give_skill_by_name (op, skill_name);
+            skill_obj = give_skill_by_name (op, skill_name);
-            }
         }
     }
   if (flag != SK_EXP_SKILL_ONLY)
     {
       player_lvl_adj (op, skill_obj);
     }
 }
 /* This function checks to make sure that object 'op' can
- * lost 'exp' experience.  It returns the amount of exp
+ * lose 'exp' experience. It returns the amount of exp
  * object 'op' can in fact lose - it basically makes
  * 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 del_exp;
   if (exp > op->stats.exp)
     exp = op->stats.exp;
   if (settings.permanent_exp_ratio)
     {
       del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
       if (del_exp < 0)
         del_exp = 0;
       if (exp > del_exp)
         exp = del_exp;
     }
   return exp;
 }
 sint64
 check_exp_adjust (const object *op, sint64 exp)
 {
   if (exp < 0)
     return check_exp_loss (op, exp);
   else
-    return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp);
+    return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
 }
 /* Subtracts experience from player.
  * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
  * only subtract from the matching skill.  Otherwise,
  * this subtracts a portion from all
   sint64 del_exp;
   for (tmp = op->inv; tmp; tmp = tmp->below)
     if (tmp->type == SKILL && tmp->stats.exp)
       {
-        if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill))
+        if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill))
           {
             del_exp = check_exp_loss (tmp, exp);
             tmp->stats.exp -= del_exp;
             player_lvl_adj (op, tmp);
           }
  * amount of permenent experience, whichever gives the lowest loss.
  */
 void
 apply_death_exp_penalty (object *op)
 {
-  object *tmp;
   sint64 loss;
   sint64 percentage_loss;       /* defined by the setting 'death_penalty_percent' */
   sint64 level_loss;            /* defined by the setting 'death_penalty_levels */
-  for (tmp = op->inv; tmp; tmp = tmp->below)
+  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)];
         /* With the revised exp system, you can get cases where
          * losing several levels would still require that you have more
          * tables is a lot harder.
          */
         if (level_loss < 0)
           level_loss = 0;
-        loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss));
+        loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
         tmp->stats.exp -= loss;
         player_lvl_adj (op, tmp);
       }
   percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
-  level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)];
+  level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
   if (level_loss < 0)
     level_loss = 0;
-  loss = check_exp_loss (op, MIN (level_loss, percentage_loss));
+  loss = check_exp_loss (op, min (level_loss, percentage_loss));
   op->stats.exp -= loss;
   player_lvl_adj (op, NULL);
 }

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.77 by root, Tue Aug 7 23:38:12 2007 UTC vs. Revision 1.93 by root, Thu Dec 18 19:56:09 2008 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.77 by root, Tue Aug 7 23:38:12 2007 UTC vs.
Revision 1.93 by root, Thu Dec 18 19:56:09 2008 UTC