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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.33 by root, Sat Jan 27 02:19:36 2007 UTC vs.
Revision 1.38 by root, Sun Apr 29 04:14:57 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  *
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (C) 1992 Frank Tore Johansen
  *
  * Updates all abilities given by applied objects in the inventory
  * of the given object.  Note: This function works for both monsters
  * and players; the "player" in the name is purely an archaic inheritance.
  * This functions starts from base values (archetype or player object)
  * and then adjusts them according to what the player has equipped.
- */
+ *
-/* July 95 - inserted stuff to handle new skills/exp system - b.t.
+ * July 95 - inserted stuff to handle new skills/exp system - b.t.
-   spell system split, grace points now added to system  --peterm
+ * spell system split, grace points now added to system  --peterm
  */
 void
 object::update_stats ()
 {
   int i, j;
   float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1;
       /* Don't clobber all the range_ values.  range_golem otherwise
        * gets reset for no good reason, and we don't want to reset
        * range_magic (what spell is readied).  These three below
        * well get filled in based on what the player has equipped.
        */
-      contr->ranges[range_bow] = NULL;
+      contr->ranges[range_bow]   = 0;
-      contr->ranges[range_misc] = NULL;
+      contr->ranges[range_misc]  = 0;
-      contr->ranges[range_skill] = NULL;
+      contr->ranges[range_skill] = 0;
     }
   memcpy (body_used, body_info, sizeof (body_info));
   slaying = 0;
   speed = arch->clone.speed;
   /* OK - we've reset most all the objects attributes to sane values.
    * now go through and make adjustments for what the player has equipped.
    */
   for (tmp = inv; tmp; tmp = tmp->below)
     {
       /* See note in map.c:update_position about making this additive
        * since light sources are never applied, need to put check here.
        */
               /* these are the items that currently can change digestion, regeneration,
                * spell point recovery and mana point recovery.  Seems sort of an arbitary
                * list, but other items store other info into stats array.
                */
-              if ((tmp->type == WEAPON)  ||
+              if ((tmp->type == WEAPON)  || (tmp->type == BOW)    ||
                   (tmp->type == ARMOUR)  || (tmp->type == HELMET) ||
                   (tmp->type == SHIELD)  || (tmp->type == RING)   ||
                   (tmp->type == BOOTS)   || (tmp->type == GLOVES) ||
                   (tmp->type == AMULET)  || (tmp->type == GIRDLE) ||
                   (tmp->type == BRACERS) || (tmp->type == CLOAK)  ||
               if (speed_reduce_from_disease == 0)
                 speed_reduce_from_disease = 1;
             }
           /* Pos. and neg. protections are counted seperate (-> pro/vuln).
-           * (Negative protections are calculated extactly like positive.)
+           * (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)
             {
                         potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]);
                       else
                         potion_resist[i] = tmp->resist[i];
                     }
                   else 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)
-                    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 != BOW && tmp->type != SYMPTOM)
               case HELMET:
               case BOOTS:
               case GLOVES:
               case CLOAK:
                 if (tmp->stats.wc)
-                  wc -= (tmp->stats.wc + tmp->magic);
+                  wc -= tmp->stats.wc + tmp->magic;
                 if (tmp->stats.dam)
-                  stats.dam += (tmp->stats.dam + tmp->magic);
+                  stats.dam += tmp->stats.dam + tmp->magic;
                 if (tmp->stats.ac)
-                  ac -= (tmp->stats.ac + tmp->magic);
+                  ac -= tmp->stats.ac + tmp->magic;
                 break;
+              case BOW:
               case WEAPON:
-                wc -= (tmp->stats.wc + tmp->magic);
+                wc -= tmp->stats.wc + tmp->magic;
                 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
                   ac -= tmp->stats.ac + tmp->magic;
-                stats.dam += (tmp->stats.dam + tmp->magic);
+                stats.dam += tmp->stats.dam + tmp->magic;
                 weapon_weight = tmp->weight;
                 weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
                 if (weapon_speed < 0)
                   weapon_speed = 0;
        * monster bonus the same as before. -b.t.
        */
       if (type == PLAYER && wc_obj && wc_obj->level > 1)
         {
-          wc -= (wc_obj->level + thaco_bonus[stats.Str]);
+          wc -= wc_obj->level + thaco_bonus[stats.Str];
           for (i = 1; i < wc_obj->level; i++)
             {
               /* addtional wc every 6 levels */
               if (!(i % 6))
                 wc--;
               /* addtional dam every 4 levels. */
-              if (!(i % 4) && (dam_bonus[stats.Str] >= 0))
+              if (!(i % 4) && dam_bonus[stats.Str] >= 0)
-                stats.dam += (1 + (dam_bonus[stats.Str] / 5));
+                stats.dam += 1 + dam_bonus[stats.Str] / 5;
             }
         }
       else
-        wc -= (level + thaco_bonus[stats.Str]);
+        wc -= level + thaco_bonus[stats.Str];
       stats.dam += dam_bonus[stats.Str];
       if (stats.dam < 1)
         stats.dam = 1;
   if (type == PLAYER)
     {
       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;
 }
 /*
  * Returns true if the given player is a legal class.
  * The function to add and remove class-bonuses to the stats doesn't
             del_exp = check_exp_loss (tmp, (sint64) (tmp->stats.exp * fraction));
             tmp->stats.exp -= del_exp;
             player_lvl_adj (op, tmp);
           }
       }
   if (flag != SK_SUBTRACT_SKILL_EXP)
     {
       del_exp = check_exp_loss (op, exp);
       op->stats.exp -= del_exp;
       player_lvl_adj (op, NULL);
     }
 }
 /* change_exp() - changes experience to a player/monster.  This
  * does bounds checking to make sure we don't overflow the max exp.
  *
  * The exp passed is typically not modified much by this function -
  * it is assumed the caller has modified the exp as needed.
  * skill_name is the skill that should get the exp added.
  * flag is what to do if player doesn't have the skill.
  * these last two values are only used for players.
  */
 void
 change_exp (object *op, sint64 exp, const char *skill_name, int flag)
 {
 #ifdef EXP_DEBUG
   LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
 #endif
   /* safety */
 /* Applies a death penalty experience, the size of this is defined by the
  * settings death_penalty_percentage and death_penalty_levels, and by the
  * amount of permenent experience, whichever gives the lowest loss.
  */
 void
 apply_death_exp_penalty (object *op)
 {
   object *tmp;
   sint64 loss;

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.33 by root, Sat Jan 27 02:19:36 2007 UTC vs. Revision 1.38 by root, Sun Apr 29 04:14:57 2007 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.33 by root, Sat Jan 27 02:19:36 2007 UTC vs.
Revision 1.38 by root, Sun Apr 29 04:14:57 2007 UTC