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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.123 by root, Sat May 15 23:41:05 2010 UTC vs.
Revision 1.131 by root, Wed Nov 14 05:18:17 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * 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.
  *
  * 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 Affero GNU General Public License
  * 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>
 static const int con_bonus[MAX_STAT + 1] = {
   -6, -5, -4, -3, -2, -1, -1, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 14, 16, 18, 20,
   22, 25, 30, 40, 50
 };
 /* changed the name of this to "sp_bonus" from "int_bonus"
  * because Pow can now be the stat that controls spellpoint
  * advancement. -b.t.
  */
 static const int sp_bonus[MAX_STAT + 1] = {
   -10, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 15, 20, 25,
  * These limits are probably overly generous, but being there were no values
  * before, you need to start someplace.
  */
 const uint32 weight_limit[MAX_STAT + 1] = {
-  200000,                       /* 0 */
+   200000,                                      /*  0 */
-  250000, 300000, 350000, 400000, 500000,       /* 5 */
+   250000,  300000,  350000,  400000,  500000,  /*  5 */
-  600000, 700000, 800000, 900000, 1000000,      /* 10 */
+   600000,  700000,  800000,  900000, 1000000,  /* 10 */
   1100000, 1200000, 1300000, 1400000, 1500000,  /* 15 */
   1650000, 1800000, 1950000, 2100000, 2250000,  /* 20 */
   2400000, 2550000, 2700000, 2850000, 3000000,  /* 25 */
-  3250000, 3500000, 3750000, 4000000, 4500000   /*30 */
+  3250000, 3500000, 3750000, 4000000, 4500000   /* 30 */
 };
 const int learn_spell[MAX_STAT + 1] = {
   0, 0, 0, 1, 2, 4, 8, 12, 16, 25, 36, 45, 55, 65, 70, 75, 80, 85, 90, 95, 100, 100, 100, 100, 100,
   100, 100, 100, 100, 100, 100
  * spell system split, grace points now added to system  --peterm
  */
 void
 object::update_stats ()
 {
-  float f, max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
+  float max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
-  int weapon_weight = 0, weapon_speed = 0;
+  weight_t weapon_weight = 0;
+  int weapon_speed = 0;
   int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
   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];
                   if (tmp->stats.ac)
                     ac -= tmp->stats.ac + tmp->magic;
                   if (settings.spell_encumbrance == TRUE && type == PLAYER)
-                    contr->encumbrance += 3 * tmp->weight / 1000;
+                    contr->encumbrance += weight_to_kg_approx (3 * tmp->weight);
                 }
                 break;
               case SHIELD:
                 if (settings.spell_encumbrance == TRUE && type == PLAYER)
-                  contr->encumbrance += tmp->weight / 2000;
+                  contr->encumbrance += weight_to_kg_approx (tmp->weight) >> 1;
                 //FALLTHROUGH
               case RING:
               case AMULET:
               case GIRDLE:
               case HELMET:
                  * go.
                  */
                 if (type == PLAYER)
                   if (settings.spell_encumbrance)
-                    contr->encumbrance += tmp->weight * 3 / 1000;
+                    contr->encumbrance += weight_to_kg_approx (3 * tmp->weight);
                 break;
               case ARMOUR:     /* Only the best of these three are used: */
                 if (settings.spell_encumbrance == TRUE && type == PLAYER)
-                  contr->encumbrance += tmp->weight / 1000;
+                  contr->encumbrance += weight_to_kg_approx (tmp->weight);
               case BRACERS:
               case FORCE:
                 if (tmp->stats.wc)
                   {
                 if (tmp->stats.ac)
                   ac -= tmp->stats.ac + tmp->magic;
                 if (ARMOUR_SPEED (tmp))
-                  max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
+                  min_it (max_speed, ARMOUR_SPEED (tmp) / 10.f);
                 break;
             }                   /* switch tmp->type */
         }                       /* item is equipped */
     }                           /* for loop of items */
       /* 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
        */
-      float f = (carrying / 1000) - max_carry[stats.Str];
+      float f = (sint32)weight_to_kg_approx (carrying) - max_carry[stats.Str];
       if (f > 0.f)
-        speed = speed / (1.f + f / max_carry[stats.Str]);
+        speed /= (1.f + f / max_carry[stats.Str]);
     }
   speed += bonus_speed / 10.f;      /* Not affected by limits */
   speed *= speed_reduce_from_disease;
         update_all_los (env->map, env->x, env->y);
     }
 }
 /*
- * Returns true if the given player is a legal class.
- * The function to add and remove class-bonuses to the stats doesn't
- * check if the stat becomes negative, thus this function
- * merely checks that all stats are 1 or more, and returns
- * false otherwise.
- */
-int
-allowed_class (const object *op)
-{
-  return op->stats.Dex > 0
-      && op->stats.Str > 0
-      && op->stats.Con > 0
-      && op->stats.Int > 0
-      && op->stats.Wis > 0
-      && op->stats.Pow > 0
-      && op->stats.Cha > 0;
-}
-/*
  * 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)
  */
 void
 static void
 add_player_exp (object *op, sint64 exp, shstr_tmp skill_name, int flag)
 {
   object *skill_obj;
   sint64 limit, exp_to_add;
-  int i;
   /* prevents some forms of abuse. */
   if (op->contr->braced)
     exp /= 5;
         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));

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.123 by root, Sat May 15 23:41:05 2010 UTC vs. Revision 1.131 by root, Wed Nov 14 05:18:17 2012 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.123 by root, Sat May 15 23:41:05 2010 UTC vs.
Revision 1.131 by root, Wed Nov 14 05:18:17 2012 UTC