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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.210 by root, Fri Nov 6 13:03:34 2009 UTC vs.
Revision 1.229 by root, Fri Mar 26 20:17:48 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 (©) 2001,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2001 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 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.
  */
 int
 apply_potion (object *op, object *tmp)
 {
   int got_one = 0, i;
-  object *force = 0, *floor = 0;
+  object *force = 0;
-  floor = GET_MAP_OB (op->map, op->x, op->y);
+  object *floor = GET_MAP_OB (op->map, op->x, op->y);
   if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
     {
       op->failmsg ("Gods prevent you from using this here, it's sacred ground!");
           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)
  * 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 = -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);
           if (victim->type == PLAYER && EXIT_PATH (trap))
             {
               /* Basically, don't show exits leading to random maps the
                * players output.
                */
-              if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
+              if (trap->msg && EXIT_PATH (trap) != shstr_random_map_exit)
                 victim->statusmsg (trap->msg, NDI_NAVY);
               trap->play_sound (trap->sound);
               victim->enter_exit (trap);
             }
                   : lev_diff < 15 ? "This book is way beyond your comprehension."
                   :                 "This book is totally beyond your comprehension.");
       return;
     }
+  // we currently don't use the message types for anything.
-  readable_message_type *msgType = get_readable_message_type (tmp);
+  // readable_message_type *msgType = get_readable_message_type (tmp);
+  tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("apply_book"));
   if (player *pl = op->contr)
     if (client *ns = pl->ns)
       pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
    * instead of having their spell stored in stats.sp.  These are
    * legacy spellbooks
    */
   if (tmp->slaying)
     {
-      spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
+      spell = find_archetype_by_object_name (tmp->slaying)->instance ();
       if (!spell)
         {
           op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying));
           return;
         }
    * 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);
   int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */
   int winners = 0;              /* number of winners */
   int i;                        /* index */
   /* let's make sure and doublecheck the parameters */
-  if (meal->type != FLESH || !is_dragon_pl (op))
+  if (meal->type != FLESH || !op->is_dragon ())
     return 0;
   /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
      from the player's inventory */
   for (tmp = op->inv; tmp; tmp = tmp->below)
     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++;
             }
   if (op->type != PLAYER)
     op->stats.hp = op->stats.maxhp;
   else
     {
       /* check if this is a dragon (player), eating some flesh */
-      if (tmp->type == FLESH && is_dragon_pl (op) && dragon_eat_flesh (op, tmp))
+      if (tmp->type == FLESH && op->is_dragon () && dragon_eat_flesh (op, tmp))
         ;
       else
         {
           /* usual case - no dragon meal: */
           if (op->stats.food + tmp->stats.food > 999)
           if (!QUERY_FLAG (tmp, FLAG_CURSED))
             {
               const char *buf;
-              if (!is_dragon_pl (op))
+              if (!op->is_dragon ())
                 {
                   /* eating message for normal players */
                   if (tmp->type == DRINK)
                     buf = format ("Ahhh...that %s tasted good.", &tmp->name);
                   else
       hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
     }
   op->stats.food -= op->stats.food / 4;
   poison->destroy ();
-}
-/**
- * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
- * A valid 2 way exit means:
- *   -You can come back (there is another exit at the other side)
- *   -You are
- *         ° the owner of the exit
- *         ° or in the same party as the owner
- *
- * 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).
- */
-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 */
-#if 0 //TODO
-  if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
-    return 0;                   /* This is a reset town portal */
-#endif
-  LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
-  maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
-  if (exitmap)
-    {
-      exitmap->load_sync ();
-      object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
-      if (!tmp)
-        return 0;
-      for (; tmp; tmp = tmp->above)
-        {
-          if (tmp->type != EXIT)
-            continue;           /*Not an exit */
-          if (!EXIT_PATH (tmp))
-            continue;           /*Not a valid exit */
-          if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
-            continue;           /*Not in the same place */
-          if (exit->map->path != EXIT_PATH (tmp))
-            continue;           /*Not in the same map */
-          /* From here we have found the exit is valid. However we do
-           * here the check of the exit owner. It is important for the
-           * town portals to prevent strangers from visiting your appartments
-           */
-          if (!exit->race)
-            return 1;           /*No owner, free for all! */
-          object *exit_owner = 0;
-          for_all_players (pp)
-            {
-              if (!pp->ob)
-                continue;
-              if (pp->ob->name != exit->race)
-                continue;
-              exit_owner = pp->ob;      /*We found a player which correspond to the player name */
-              break;
-            }
-          if (!exit_owner)
-            return 0;           /* No more owner */
-          if (exit_owner->contr == op->contr)
-            return 1;           /*It is your exit */
-          if (exit_owner &&     /*There is a owner */
-              (op->contr) &&    /*A player tries to pass */
-              ((exit_owner->contr->party == NULL) ||    /*No pass if controller has no party */
-               (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
-            return 0;
-          return 1;
-        }
-    }
-  return 0;
 }
 /**
  * This function will try to apply a lighter and in case no lighter
  * is specified it will try to find a lighter in the players inventory,
 static void
 apply_item_transformer (object *pl, object *transformer)
 {
   object *marked;
   object *new_item;
-  char *find;
+  const char *find;
   char *separator;
   int yield;
   char got[MAX_BUF];
   int len;
   while (*find == ' ')
     find++;
   memset (got, 0, MAX_BUF);
-  if ((separator = strchr (find, ';')) != NULL)
+  if ((separator = (char *) strchr (find, ';')))
     len = separator - find;
   else
     len = strlen (find);
-  if (len > MAX_BUF - 1)
+  min_it (len, MAX_BUF - 1);
-    len = MAX_BUF - 1;
   strcpy (got, find);
   got[len] = '\0';
   /* Now create new item, remove used ones when required. */
       case EXIT:
         if (who->type != PLAYER)
           return 0;
-        if (!EXIT_PATH (op) || !is_legal_2ways_exit (who, op))
+        if (!EXIT_PATH (op))
           who->failmsg (format ("The %s is closed. H<And will stay closed, until somebody fires up the map editor and adds it.>", query_name (op)));
         else
           {
             /* Don't display messages for random maps. */
-            if (op->msg && !EXIT_PATH (op).starts_with ("/!"))
+            if (op->msg && EXIT_PATH (op) != shstr_random_map_exit)
               who->statusmsg (op->msg, NDI_NAVY);
             who->enter_exit (op);
           }
       case SKILL:
         if (player *pl = who->contr)
           {
             if (IS_COMBAT_SKILL (op->subtype))
               {
-                if (skill_flags [op->subtype] & SF_NEED_WEAPON)
+                if (skill_flags [op->subtype] & SF_NEED_ITEM)
                   {
                     for (object *item = who->inv; item; item = item->below)
-                      if (item->type == WEAPON && item->flag [FLAG_APPLIED])
+                      if (item->type == item->weapontype && item->flag [FLAG_APPLIED])
                         {
                           if (item->skill == op->skill)
                             {
                               who->change_weapon (pl->combat_ob = item);
                               goto found_weapon;
                 else
                   who->change_weapon (pl->combat_ob = op);
               }
             else if (IS_RANGED_SKILL (op->subtype))
               {
-                if (skill_flags [op->subtype] & SF_NEED_BOW)
+                if (skill_flags [op->subtype] & SF_NEED_ITEM)
                   {
                     for (object *item = who->inv; item; item = item->below)
-                      if (item->type == BOW && item->flag [FLAG_APPLIED])
+                      if (item->type == item->weapontype && item->flag [FLAG_APPLIED])
                         {
                           //TODO: bows should/must all have skill missile weapon right now
                           who->change_weapon (pl->ranged_ob = item);
                           goto found_bow;
                         }
     esrv_send_item (pl, op);
   return 0;
 }
-static 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.
  *
  * Generates shop floor's item, and treasures.
  */
                      * treasure again for this object
                      */
                     invtmp->randomitems = NULL;
                   }
               }
             /* This is really temporary - the code at the bottom will
              * also set randomitems to null.  The problem is there are bunches
              * of maps/players already out there with items that have spells
              * which haven't had the randomitems set to null yet.
              * MSW 2004-05-13
              * Ryo 2004-08-16
              */
             if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
                 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
               tmp->randomitems = NULL;
           }
         if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
           auto_apply (tmp);
         else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
   /* bigger morsel of food = longer effect time */
   int duration = TIME2TICK (food->stats.food);
   if (force = who->force_find (key))
     {
-      if (duration > abs (force->speed_left / force->speed))
+      if (duration > fabs (force->speed_left / force->speed))
         {
           new_draw_info_format (NDI_UNIQUE, 0, who, "More magical force spreads through you. H<The effect will last for about %.10g more seconds.>", TICK2TIME (duration));
           force->force_set_timer (duration);
         }
       else

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.210 by root, Fri Nov 6 13:03:34 2009 UTC vs. Revision 1.229 by root, Fri Mar 26 20:17:48 2010 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.210 by root, Fri Nov 6 13:03:34 2009 UTC vs.
Revision 1.229 by root, Fri Mar 26 20:17:48 2010 UTC