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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.134 by root, Sat Oct 20 04:39:59 2007 UTC vs.
Revision 1.142 by root, Sun Apr 13 20:21:50 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,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 <cmath>
 #include <global.h>
   if (armour->magic >= settings.armor_max_enchant)
     {
       op->failmsg ("This armour can not be enchanted any further!");
       return 0;
     }
   /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
    * etc), so take the easy way out and don't worry about it.
    * Note - maybe add scrolls which make the random artifact versions (eg, armour
    * of gnarg and what not?)
    */
     {
       op->failmsg ("This armour will not accept further enchantment.");
       return 0;
     }
-  /* Split objects if needed.  Can't insert tmp until the
+  /* Split objects if needed. Can't insert tmp until the
    * end of this function - otherwise it will just re-merge.
    */
   if (armour->nrof > 1)
     tmp = get_split_ob (armour, armour->nrof - 1);
   else
 }
 /*
  * convert_item() returns 1 if anything was converted, 0 if the item was not
  * what the converter wants, -1 if the converter is broken.
- */
+ *
-#define CONV_FROM(xyz)	xyz->slaying
-#define CONV_TO(xyz)	xyz->other_arch
-#define CONV_NR(xyz)	xyz->stats.sp
-#define CONV_NEED(xyz)	xyz->stats.food
-/* Takes one items and makes another.
+ * Takes one type of items and makes another.
  * converter is the object that is doing the conversion.
  * item is the object that triggered the converter - if it is not
  * what the converter wants, this will not do anything.
  */
-int
+static int
 convert_item (object *item, object *converter)
 {
-  int nr = 0;
-  uint32 price_in;
+  sint64 nr, 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;
   /* We make some assumptions - we assume if it takes money as it type,
    * it wants some amount.  We don't make change (ie, if something costs
    * 3 gp and player drops a platinum, tough luck)
    */
-  if (CONV_FROM (converter) == shstr_money)
+  if (conv_from == shstr_money)
     {
       if (item->type != MONEY)
         return 0;
-      nr = (item->nrof * item->value) / CONV_NEED (converter);
+      nr = sint64 (item->nrof) * item->value / need;
       if (!nr)
         return 0;
       converter->play_sound (sound_find ("shop_buy"));
-      int cost = nr * CONV_NEED (converter) / item->value;
+      sint64 cost = (nr * need + item->value - 1) / item->value;
-      /* take into account rounding errors */
-      if (nr * CONV_NEED (converter) % item->value)
-        cost++;
       decrease_ob_nr (item, cost);
       price_in = cost * item->value;
     }
   else
     {
-      if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname ||
+      if (item->type == PLAYER
-          (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof))
+          || conv_from != item->arch->archname
+          || (need && need > (uint16) item->nrof))
         return 0;
       converter->play_sound (sound_find ("convert_item"));
-      if (CONV_NEED (converter))
+      if (need)
         {
-          nr = item->nrof / CONV_NEED (converter);
+          nr = sint64 (item->nrof) / need;
-          decrease_ob_nr (item, nr * CONV_NEED (converter));
+          decrease_ob_nr (item, nr * need);
-          price_in = nr * CONV_NEED (converter) * item->value;
+          price_in = nr * need * item->value;
         }
       else
         {
           price_in = item->value;
           item->destroy ();
       CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
       unflag_inv (item, FLAG_IS_A_TEMPLATE);
     }
   else
     {
-      if (converter->other_arch == NULL)
+      if (!conv_to)
         {
           LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
                &converter->name, &converter->map->path, converter->x, converter->y);
           return -1;
         }
-      item = object_create_arch (converter->other_arch);
+      item = object_create_arch (conv_to);
       fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
     }
-  if (CONV_NR (converter))
+  if (give)
-    item->nrof = CONV_NR (converter);
+    item->nrof = give;
   if (nr)
     item->nrof *= nr;
   if (is_in_shop (converter))
     SET_FLAG (item, FLAG_UNPAID);
-  else if (price_in < item->nrof * item->value)
+  else if (price_in < sint64 (item->nrof) * item->value)
     {
       LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
            &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
       /**
        * elmex: we are going to let the game continue, as the mapcreator
     }
   if (op->contr)
     if (client *ns = op->contr->ns)
       {
+        if (sign->sound)
-        ns->play_sound (sign->sound);
+          ns->play_sound (sign->sound);
+        else if (autoapply)
+          ns->play_sound (sound_find ("msg_voice"));
         if (ns->can_msg)
           op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg));
         else
           {
   if (op->env && (pl->move_type & MOVE_FLYING))
     {
       /* player is flying and applying object not in inventory */
       if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
         {
-          op->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>");
+          pl->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>");
           return 0;
         }
     }
   pl->contr->last_used = op;
   tmp = manual_apply (pl, op, aflag);
   if (!quiet)
     {
       if (tmp == 0)
-        op->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
+        pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
       else if (tmp == 2)
-        op->failmsg ("You must get it first!\n");
+        pl->failmsg ("You must get it first!\n");
     }
   return tmp;
 }

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.134 by root, Sat Oct 20 04:39:59 2007 UTC vs. Revision 1.142 by root, Sun Apr 13 20:21:50 2008 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.134 by root, Sat Oct 20 04:39:59 2007 UTC vs.
Revision 1.142 by root, Sun Apr 13 20:21:50 2008 UTC