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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.209 by root, Fri Nov 6 12:49:19 2009 UTC vs.
Revision 1.213 by elmex, Mon Nov 9 13:38:36 2009 UTC

           op->update_stats ();
           tmp->decrease ();
           return 1;
         }
-      if (!(at = archetype::find (ARCH_DEPLETION)))
+      if (!(at = archetype::find (shstr_depletion)))
         {
           LOG (llevError, "Could not find archetype depletion\n");
           return 0;
         }
     }
   /* improvement potion - only for players */
   if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
     {
-      for (i = 1; i < MIN (11, op->level); i++)
+      for (i = 1; i < min (11, op->level); i++)
         {
           if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
             {
               if (op->contr->levhp[i] != 1)
                 {
                 }
             }
         }
       /* Just makes checking easier */
-      if (i < MIN (11, op->level))
+      if (i < min (11, op->level))
         got_one = 1;
       if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
         {
           if (got_one)
 /**
  * This does the prepare weapon scroll.
  * Checks for sacrifice, and so on.
  */
-int
+static int
 prepare_weapon (object *op, object *improver, object *weapon)
 {
   int sacrifice_count, i;
   char buf[MAX_BUF];
  *
  * We are hiding extra information about the weapon in the level and
  * last_eat numbers for an object.  Hopefully this won't break anything ??
  * level == max improve last_eat == current improve
  */
-int
+static int
 improve_weapon (object *op, object *improver, object *weapon)
 {
   int sacrifice_count, sacrifice_needed = 0;
   if (improver->stats.sp == IMPROVE_PREPARE)
  * the armour value of the piece of equipment exceed either
  * the users level or 90)
  * Modified by MSW for partial resistance.  Only support
  * changing of physical area right now.
  */
-int
+static int
 improve_armour (object *op, object *improver, object *armour)
 {
   object *tmp;
   if (armour->magic >= settings.armor_max_enchant)
  * what the converter wants, this will not do anything.
  */
 int
 convert_item (object *item, object *converter)
 {
-  sint64 nr, price_in;
+  sint64 nr = 0, price_in;
   if (item->flag [FLAG_UNPAID])
     return 0;
   shstr conv_from    = converter->slaying;
   archetype *conv_to = converter->other_arch;
   sint64 need        = converter->stats.food;
   sint64 give        = converter->stats.sp;
                 trap->stats.maxsp = 2;
               /* Is this correct?  From the docs, it doesn't look like it
                * should be divided by trap->speed
                */
-              victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed);
+              victim->speed_left = -fabs (trap->stats.maxsp * victim->speed / trap->speed);
               /* Just put in some sanity check.  I think there is a bug in the
                * above with some objects have zero speed, and thus the player
                * getting permanently paralyzed.
                */
            * trigger this here and get hit by own missile - and will be own enemy.
            * Victim then is his own enemy and will start to kill herself (this is
            * removed) but we have not synced victim and his missile. To avoid senseless
            * action, we avoid hits here
            */
-          if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
+          if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->has_active_speed ())
+              && trap->owner != victim)
             hit_with_arrow (trap, victim);
           break;
         case SPELL_EFFECT:
           apply_spell_effect (trap, victim);
    * literacy rate very useful!  -b.t.
    */
   if (QUERY_FLAG (op, FLAG_CONFUSED))
     {
       op->failmsg ("In your confused state you flub the wording of the text!");
-      scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace));
+      scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), max (spell->stats.sp, spell->stats.grace));
     }
   else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
            (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
     {
       op->statusmsg ("You succeed in learning the spell!", NDI_GREEN);
     op->stats.hp += meal->stats.food / 50;
   if (op->stats.hp > op->stats.maxhp)
     op->stats.hp = op->stats.maxhp;
-  op->stats.food = MIN (999, op->stats.food + meal->stats.food);
+  op->stats.food = min (999, op->stats.food + meal->stats.food);
   /*LOG(llevDebug, "-> player: %d, flesh: %d\n", op->level, meal->level); */
   /* on to the interesting part: chances for adding resistance */
   for (i = 0; i < NROFATTACKS; i++)
           /* monster bonus increases with level, because high-level
              flesh is too rare */
           mbonus = op->level * 20. / ((double) settings.max_level);
-          chance = (((double) MIN (op->level + bonus, meal->level + bonus + mbonus)) * 100. /
+          chance = (((double)min (op->level + bonus, meal->level + bonus + mbonus)) * 100. /
-                    ((double) settings.max_level)) - skin->resist[i];
+                    ((double)settings.max_level)) - skin->resist[i];
           if (chance >= 0.)
             chance += 1.;
           else
             chance = (chance < -12) ? 0. : 1. / pow (2., -chance);
           /* chance is proportional to amount of resistance (max. 50) */
-          chance *= ((double) (MIN (meal->resist[i], 50))) / 50.;
+          chance *= ((double)(min (meal->resist[i], 50))) / 50.;
           /* doubled chance for resistance of ability-focus */
           if (i == abil->stats.exp)
-            chance = MIN (100., chance * 2.);
+            chance = min (100., chance * 2.);
           /* now make the throw and save all winners (Don't insert luck bonus here!) */
-          if (rndm (10000) < (unsigned int) (chance * 100))
+          if (rndm (10000) < (unsigned int)(chance * 100))
             {
               atnr_winner[winners] = i;
               winners++;
             }
  *
  * Note: a owner in a 2 way exit is saved as the owner's name
  * in the field exit->name cause the field exit->owner doesn't
  * survive in the swapping (in fact the whole exit doesn't survive).
  */
-int
+static int
 is_legal_2ways_exit (object *op, object *exit)
 {
   if (exit->stats.exp != 1)
     return 1;                   /*This is not a 2 way, so it is legal */
 }
 /**
  * This function generates a cursed effect for cursed lamps and torches.
  */
+static void
-void player_apply_lamp_cursed_effect (object *who, object *op)
+player_apply_lamp_cursed_effect (object *who, object *op)
 {
   if (op->level)
     {
       who->failmsg (format (
         "The %s was cursed, it explodes in a big fireball!",
  * Apply for players and lamps
  *
  * who - the player
  * op  - the lamp
  */
+static void
-void player_apply_lamp (object *who, object *op)
+player_apply_lamp (object *who, object *op)
 {
   bool switch_on = op->glow_radius ? false : true;
   if (switch_on)
     {
 #define CANNOT_REMOVE_CURSED \
   "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
   "Praying over an altar, scrolls of remove curse/damnation, " \
   "priests or even other players might help.>"
-int
+static int
 unapply_for_ob (object *who, object *op, int aflags)
 {
   if (op->is_range ())
     for (object *tmp = who->inv; tmp; tmp = tmp->below)
       if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
   if (object *pl = op->visible_to ())
     esrv_send_item (pl, op);
   return 0;
-}
-int
-monster_apply_special (object *who, object *op, int aflags)
-{
-  if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
-    return 1;
-  return apply_special (who, op, aflags);
 }
 /**
  * Map was just loaded, handle op's initialisation.
  *

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.209 by root, Fri Nov 6 12:49:19 2009 UTC vs. Revision 1.213 by elmex, Mon Nov 9 13:38:36 2009 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.209 by root, Fri Nov 6 12:49:19 2009 UTC vs.
Revision 1.213 by elmex, Mon Nov 9 13:38:36 2009 UTC