--- deliantra/server/common/utils.C 2007/05/28 21:21:40 1.57 +++ deliantra/server/common/utils.C 2007/06/07 19:12:22 1.59 @@ -206,74 +206,6 @@ return total; } -/* decay and destroy perishable items in a map */ -void -maptile::decay_objects () -{ - if (!spaces) - return; - - for (mapspace *ms = spaces + size (); ms-- > spaces; ) - for (object *above, *op = ms->bot; op; op = above) - { - above = op->above; - - bool destroy = 0; - - // do not decay anything above unique floor tiles (yet :) - if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) - break; - - if (QUERY_FLAG (op, FLAG_IS_FLOOR) - || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) - || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) - || QUERY_FLAG (op, FLAG_UNIQUE) - || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) - || QUERY_FLAG (op, FLAG_UNPAID) - || op->is_alive ()) - ; // do not decay - else if (op->is_weapon ()) - { - op->stats.dam--; - if (op->stats.dam < 0) - destroy = 1; - } - else if (op->is_armor ()) - { - op->stats.ac--; - if (op->stats.ac < 0) - destroy = 1; - } - else if (op->type == FOOD) - { - op->stats.food -= rndm (5, 20); - if (op->stats.food < 0) - destroy = 1; - } - else - { - int mat = op->materials; - - if (mat & M_PAPER - || mat & M_LEATHER - || mat & M_WOOD - || mat & M_ORGANIC - || mat & M_CLOTH - || mat & M_LIQUID - || (mat & M_IRON && rndm (1, 5) == 1) - || (mat & M_GLASS && rndm (1, 2) == 1) - || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) - || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) - || (mat & M_ICE && temp > 32)) - destroy = 1; - } - - /* adjust overall chance below */ - if (destroy && rndm (0, 1)) - op->destroy (); - } -} - /* convert materialname to materialtype_t */ materialtype_t * @@ -308,7 +240,7 @@ mt = name_to_material (op->materialname); if (!mt) { - LOG (llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->name, &op->name, &op->materialname); + LOG (llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->archname, &op->name, &op->materialname); return; }