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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.24 by root, Mon Sep 11 20:26:41 2006 UTC vs.
Revision 1.31 by root, Sun Dec 3 20:26:35 2006 UTC

-/*
- * static char *rcsid_apply_c =
- *   "$Id: apply.C,v 1.24 2006/09/11 20:26:41 root Exp $";
- */
 /*
     CrossFire, A Multiplayer game for X-windows
     Copyright (C) 2001 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    The authors can be reached via e-mail to crossfire-devel@real-time.com
+    The authors can be reached via e-mail to <crossfire@schmorp.de>
 */
 #include <global.h>
 #include <living.h>
 #include <spells.h>
           drain_stat (op);
           fix_player (op);
           decrease_ob (tmp);
           return 1;
         }
-      if ((at = find_archetype (ARCH_DEPLETION)) == NULL)
+      if ((at = archetype::find (ARCH_DEPLETION)) == NULL)
         {
           LOG (llevError, "Could not find archetype depletion\n");
           return 0;
         }
       depl = present_arch_in_ob (at, op);
       else
         {
           altar->value = 1;     /* works only once */
           push_button (altar);
         }
-      return sacrifice == NULL;
+      return !sacrifice;
     }
   else
-    {
-      return 0;
+    return 0;
-    }
 }
 /**
  * Handles 'movement' of shop mats.
  * Returns 1 if 'op' was destroyed, 0 if not.
        * the shop.
        */
       for (tmp = op->inv; tmp; tmp = next)
         {
           next = tmp->below;
           if (QUERY_FLAG (tmp, FLAG_UNPAID))
             {
               int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
               remove_ob (tmp);
       /* Removed code that checked for multipart objects - it appears that
        * the teleport function should be able to handle this just fine.
        */
       rv = teleport (shop_mat, SHOP_MAT, op);
     }
-  else if (can_pay (op))
+  else if (can_pay (op) && get_payment (op))
     {
       /* this is only used for players */
-      get_payment (op, op->inv);
       rv = teleport (shop_mat, SHOP_MAT, op);
       if (shop_mat->msg)
         new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg);
       /* This check below is a bit simplistic - generally it should be correct,
     {
       /* if we get here, a player tried to leave a shop but was not able
        * to afford the items he has.  We try to move the player so that
        * they are not on the mat anymore
        */
       int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
       if (i == -1)
         {
           LOG (llevError, "Internal shop-mat problem.\n");
     {
       LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
       new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense.");
       return;
     }
   if (spell->level > (skop->level + 10))
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols.");
       return;
     }
     }
   if (spell->skill)
     {
       spell_skill = find_skill_by_name (op, spell->skill);
       if (!spell_skill)
         {
           new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill);
           return;
         }
       if (spell_skill->level < spell->level)
         {
           new_draw_info_format (NDI_UNIQUE, 0, op, "You need to be level %d in %s to learn this spell.", spell->level, &spell->skill);
           return;
         }
  */
 static void
 apply_treasure (object *op, object *tmp)
 {
   object *treas;
-  tag_t tmp_tag = tmp->count, op_tag = op->count;
   /* Nice side effect of new treasure creation method is that the treasure
    * for the chest is done when the chest is created, and put into the chest
    * inventory.  So that when the chest burns up, the items still exist.  Also
       /* If either player or container was destroyed, no need to do
        * further processing.  I think this should be enclused with
        * spring trap above, as I don't think there is otherwise
        * any way for the treasure chest or player to get killed
        */
-      if (was_destroyed (op, op_tag) || was_destroyed (tmp, tmp_tag))
+      if (op->destroyed () || tmp->destroyed ())
         break;
     }
-  if (!was_destroyed (tmp, tmp_tag) && tmp->inv == NULL)
+  if (!tmp->destroyed () && tmp->inv == NULL)
     decrease_ob (tmp);
 }
 /**
 is_legal_2ways_exit (object *op, object *exit)
 {
   object *tmp;
   object *exit_owner;
   player *pp;
-  mapstruct *exitmap;
+  maptile *exitmap;
   if (exit->stats.exp != 1)
     return 1;                   /*This is not a 2 way, so it is legal */
   if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
     return 0;                   /* This is a reset town portal */
         tmp2->map = op->map;
         tmp2->below = op->below;
         tmp2->above = op->above;
         tmp2->stats.food = op->stats.food;
         CLEAR_FLAG (tmp2, FLAG_APPLIED);
         if (QUERY_FLAG (op, FLAG_INV_LOCKED))
           SET_FLAG (tmp2, FLAG_INV_LOCKED);
         if (who->type == PLAYER)
-          esrv_del_item (who->contr, (tag_t) op->count);
+          esrv_del_item (who->contr, op->count);
         remove_ob (op);
         free_object (op);
         insert_ob_in_ob (tmp2, who);
         fix_player (who);
         if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
   if (!(aflags & AP_NO_MERGE))
     {
       object *tmp;
-      tag_t del_tag = op->count;
       tmp = merge_ob (op, NULL);
       if (who->type == PLAYER)
         {
           if (tmp)
             {                   /* it was merged */
-              esrv_del_item (who->contr, del_tag);
+              esrv_del_item (who->contr, op->count);
               op = tmp;
             }
           esrv_send_item (who, op);
         }
     }
   return 0;
 }
           SET_FLAG (tmp2, FLAG_INV_LOCKED);
         insert_ob_in_ob (tmp2, who);
         /* Remove the old lantern */
         if (who->type == PLAYER)
-          esrv_del_item (who->contr, (tag_t) op->count);
+          esrv_del_item (who->contr, op->count);
         remove_ob (op);
         free_object (op);
         /* insert the portion that was split off */
         if (tmp != NULL)
  * when an original map is loaded) and performs special actions for
  * certain objects (most initialization of chests and creation of
  * treasures and stuff).  Calls auto_apply if appropriate.
  */
 void
-fix_auto_apply (mapstruct *m)
+fix_auto_apply (maptile *m)
 {
   object *tmp, *above = NULL;
   int x, y;
   if (m == NULL)
 void
 apply_lighter (object *who, object *lighter)
 {
   object *item;
   int is_player_env = 0;
-  uint32 nrof;
-  tag_t count;
   char item_name[MAX_BUF];
   item = find_marked_object (who);
   if (item)
     {
               esrv_send_item (who, lighter);
               oneLighter = insert_ob_in_ob (oneLighter, who);
               esrv_send_item (who, oneLighter);
             }
           else
-            {
-              lighter->stats.food--;
+            lighter->stats.food--;
-            }
         }
       else if (lighter->last_eat)
         {                       /* no charges left in lighter */
           new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name);
           return;
         }
       /* Perhaps we should split what we are trying to light on fire?
        * I can't see many times when you would want to light multiple
        * objects at once.
        */
-      nrof = item->nrof;
-      count = item->count;
       /* If the item is destroyed, we don't have a valid pointer to the
        * name object, so make a copy so the message we print out makes
        * some sense.
        */
       strcpy (item_name, item->name);
       save_throw_object (item, AT_FIRE, who);
       /* Change to check count and not freed, since the object pointer
        * may have gotten recycled
        */
-      if ((nrof != item->nrof) || (count != item->count))
+      if (item->destroyed ())
         {
           new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item_name, &lighter->name);
           /* Need to update the player so that the players glow radius
            * gets changed.
            */
           if (is_player_env)
             fix_player (who);
         }
       else
-        {
-          new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
+        new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
-        }
     }
   else                          /* nothing to light */
     new_draw_info (NDI_UNIQUE, 0, who, "You need to mark a lightable object.");
 }
   if (!new_item)
     {
       new_draw_info_format (NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name (marked, 0));
       return;
     }
   new_item->nrof = yield;
   new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0));
   insert_ob_in_ob (new_item, pl);
   esrv_send_inventory (pl, pl);
   /* Eat up one item */

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.24 by root, Mon Sep 11 20:26:41 2006 UTC vs. Revision 1.31 by root, Sun Dec 3 20:26:35 2006 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.24 by root, Mon Sep 11 20:26:41 2006 UTC vs.
Revision 1.31 by root, Sun Dec 3 20:26:35 2006 UTC