ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.318 by root, Sat Apr 3 02:27:24 2010 UTC vs.
Revision 1.323 by root, Sun Apr 11 23:56:09 2010 UTC

… …
266 * This is to the comparison of the flags below will be OK. We 266 * This is to the comparison of the flags below will be OK. We
267 * just can't ignore the been applied or identified flags, as they 267 * just can't ignore the been applied or identified flags, as they
268 * are not equal - just if it has been identified, the been_applied 268 * are not equal - just if it has been identified, the been_applied
269 * flags lose any meaning. 269 * flags lose any meaning.
270 */ 270 */
271 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 271 if (ob1->flag [FLAG_IDENTIFIED])
272 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 272 ob1->set_flag (FLAG_BEEN_APPLIED);
273 273
274 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 274 if (ob2->flag [FLAG_IDENTIFIED])
275 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 275 ob2->set_flag (FLAG_BEEN_APPLIED);
276 276
277 if (ob1->arch->archname != ob2->arch->archname 277 if (ob1->arch->archname != ob2->arch->archname
278 || ob1->name != ob2->name 278 || ob1->name != ob2->name
279 || ob1->title != ob2->title 279 || ob1->title != ob2->title
280 || ob1->msg != ob2->msg 280 || ob1->msg != ob2->msg
… …
329 329
330 /* Don't merge objects that are applied. With the new 'body' code, 330 /* Don't merge objects that are applied. With the new 'body' code,
331 * it is possible for most any character to have more than one of 331 * it is possible for most any character to have more than one of
332 * some items equipped, and we don't want those to merge. 332 * some items equipped, and we don't want those to merge.
333 */ 333 */
334 if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) 334 if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
335 return 0; 335 return 0;
336 336
337 /* Note sure why the following is the case - either the object has to 337 /* Note sure why the following is the case - either the object has to
338 * be animated or have a very low speed. Is this an attempted monster 338 * be animated or have a very low speed. Is this an attempted monster
339 * check? 339 * check?
340 */ 340 */
341 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) 341 if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
342 return 0; 342 return 0;
343 343
344 switch (ob1->type) 344 switch (ob1->type)
345 { 345 {
346 case SCROLL: 346 case SCROLL:
… …
574 } 574 }
575 575
576 this->owner = owner; 576 this->owner = owner;
577} 577}
578 578
579int
580object::slottype () const
581{
582 if (type == SKILL)
583 {
584 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
585 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
586 }
587 else
588 {
589 if (slot [body_combat].info) return slot_combat;
590 if (slot [body_range ].info) return slot_ranged;
591 }
592
593 return slot_none;
594}
595
596/* Zero the key_values on op, decrementing the shared-string 579/* Zero the key_values on op, decrementing the shared-string
597 * refcounts and freeing the links. 580 * refcounts and freeing the links.
598 */ 581 */
599static void 582static void
600free_key_values (object *op) 583free_key_values (object *op)
… …
700 * be called to update the face variable, _and_ how it looks on the map. 683 * be called to update the face variable, _and_ how it looks on the map.
701 */ 684 */
702void 685void
703update_turn_face (object *op) 686update_turn_face (object *op)
704{ 687{
705 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) 688 if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
706 return; 689 return;
707 690
708 SET_ANIMATION (op, op->direction); 691 SET_ANIMATION (op, op->direction);
709 update_object (op, UP_OBJ_FACE); 692 update_object (op, UP_OBJ_FACE);
710} 693}
… …
776 /* nop */; 759 /* nop */;
777 else if (action == UP_OBJ_INSERT) 760 else if (action == UP_OBJ_INSERT)
778 { 761 {
779#if 0 762#if 0
780 // this is likely overkill, TODO: revisit (schmorp) 763 // this is likely overkill, TODO: revisit (schmorp)
781 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 764 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
782 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 765 || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
783 || (op->is_player () && !(m.flags_ & P_PLAYER)) 766 || (op->is_player () && !(m.flags_ & P_PLAYER))
784 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 767 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
785 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 768 || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
786 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 769 || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
787 || (m.move_on | op->move_on ) != m.move_on 770 || (m.move_on | op->move_on ) != m.move_on
788 || (m.move_off | op->move_off ) != m.move_off 771 || (m.move_off | op->move_off ) != m.move_off
789 || (m.move_slow | op->move_slow) != m.move_slow 772 || (m.move_slow | op->move_slow) != m.move_slow
790 /* This isn't perfect, but I don't expect a lot of objects to 773 /* This isn't perfect, but I don't expect a lot of objects to
791 * have move_allow right now. 774 * have move_allow right now.
… …
812 update_object (op->more, action); 795 update_object (op->more, action);
813} 796}
814 797
815object::object () 798object::object ()
816{ 799{
817 SET_FLAG (this, FLAG_REMOVED); 800 this->set_flag (FLAG_REMOVED);
818 801
819 //expmul = 1.0; declared const for the time being 802 //expmul = 1.0; declared const for the time being
820 face = blank_face; 803 face = blank_face;
821 material = MATERIAL_NULL; 804 material = MATERIAL_NULL;
822} 805}
… …
956 map->insert (op, x, y); 939 map->insert (op, x, y);
957 } 940 }
958 } 941 }
959} 942}
960 943
944/*
945 * Remove and free all objects in the inventory of the given object.
946 * Unlike destroy_inv, this assumes the *this is destroyed as well
947 * well, so we can (and have to!) take shortcuts.
948 */
949void
950object::destroy_inv_fast ()
951{
952 while (object *op = inv)
953 {
954 // remove from object the fast way
955 op->flag [FLAG_REMOVED] = true;
956 op->env = 0;
957 if ((inv = inv->below))
958 inv->above = 0;
959
960 // then destroy
961 op->destroy ();
962 }
963}
964
961object *object::create () 965object *object::create ()
962{ 966{
963 object *op = new object; 967 object *op = new object;
964 op->link (); 968 op->link ();
965 return op; 969 return op;
… …
1035 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1039 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1036 head->destroy (); 1040 head->destroy ();
1037 return; 1041 return;
1038 } 1042 }
1039 1043
1040 destroy_inv (false); 1044 destroy_inv_fast ();
1041 1045
1042 if (is_head ()) 1046 if (is_head ())
1043 if (sound_destroy) 1047 if (sound_destroy)
1044 play_sound (sound_destroy); 1048 play_sound (sound_destroy);
1045 else if (flag [FLAG_MONSTER]) 1049 else if (flag [FLAG_MONSTER])
… …
1145 else if (pl->container_ () == this) 1149 else if (pl->container_ () == this)
1146 { 1150 {
1147 // removing a container should close it 1151 // removing a container should close it
1148 close_container (); 1152 close_container ();
1149 } 1153 }
1150 1154 else
1151 esrv_del_item (pl->contr, count); 1155 esrv_del_item (pl->contr, count);
1152 } 1156 }
1153 1157
1154 /* link the object above us */ 1158 /* link the object above us */
1155 // re-link, make sure compiler can easily use cmove 1159 // re-link, make sure compiler can easily use cmove
1156 *(above ? &above->below : &ms.top) = below; 1160 *(above ? &above->below : &ms.top) = below;
… …
1342 // from here :/ 1346 // from here :/
1343 op->nrof += tmp->nrof; 1347 op->nrof += tmp->nrof;
1344 tmp->destroy (); 1348 tmp->destroy ();
1345 } 1349 }
1346 1350
1347 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1351 op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1348 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1352 op->clr_flag (FLAG_INV_LOCKED);
1349 1353
1350 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1354 if (!op->flag [FLAG_ALIVE])
1351 CLEAR_FLAG (op, FLAG_NO_STEAL); 1355 op->clr_flag (FLAG_NO_STEAL);
1352 1356
1353 if (flag & INS_BELOW_ORIGINATOR) 1357 if (flag & INS_BELOW_ORIGINATOR)
1354 { 1358 {
1355 if (originator->map != op->map || originator->x != op->x || originator->y != op->y) 1359 if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1356 { 1360 {
… …
1391 * when lots of spells are cast in one area. Currently, it is presumed 1395 * when lots of spells are cast in one area. Currently, it is presumed
1392 * that flying non pickable objects are spell objects. 1396 * that flying non pickable objects are spell objects.
1393 */ 1397 */
1394 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1398 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1395 { 1399 {
1396 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) 1400 if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1397 floor = tmp; 1401 floor = tmp;
1398 1402
1399 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1403 if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1400 { 1404 {
1401 /* We insert above top, so we want this object below this */ 1405 /* We insert above top, so we want this object below this */
1402 top = tmp->below; 1406 top = tmp->below;
1403 break; 1407 break;
1404 } 1408 }
… …
1422 && (op->face && !faces [op->face].visibility)) 1426 && (op->face && !faces [op->face].visibility))
1423 { 1427 {
1424 object *last; 1428 object *last;
1425 1429
1426 for (last = top; last != floor; last = last->below) 1430 for (last = top; last != floor; last = last->below)
1427 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1431 if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1428 break; 1432 break;
1429 1433
1430 /* Check to see if we found the object that blocks view, 1434 /* Check to see if we found the object that blocks view,
1431 * and make sure we have a below pointer for it so that 1435 * and make sure we have a below pointer for it so that
1432 * we can get inserted below this one, which requires we 1436 * we can get inserted below this one, which requires we
… …
1563 || (items < m->max_items 1567 || (items < m->max_items
1564 && ms.volume () < m->max_volume)) 1568 && ms.volume () < m->max_volume))
1565 return true; 1569 return true;
1566 1570
1567 if (originator && originator->is_player ()) 1571 if (originator && originator->is_player ())
1568 originator->contr->failmsg (format ( 1572 originator->contr->failmsgf (
1569 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", 1573 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1570 query_name () 1574 query_name ()
1571 )); 1575 );
1572 1576
1573 return false; 1577 return false;
1574} 1578}
1575 1579
1576/* 1580/*
… …
1750 * on top. 1754 * on top.
1751 */ 1755 */
1752int 1756int
1753check_move_on (object *op, object *originator) 1757check_move_on (object *op, object *originator)
1754{ 1758{
1755 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1759 if (op->flag [FLAG_NO_APPLY])
1756 return 0; 1760 return 0;
1757 1761
1758 object *tmp; 1762 object *tmp;
1759 maptile *m = op->map; 1763 maptile *m = op->map;
1760 int x = op->x, y = op->y; 1764 int x = op->x, y = op->y;
… …
1797 * Second check makes sure that the movement types not being slowed 1801 * Second check makes sure that the movement types not being slowed
1798 * (~slow_move) is not blocked on this space - just because the 1802 * (~slow_move) is not blocked on this space - just because the
1799 * space doesn't slow down swimming (for example), if you can't actually 1803 * space doesn't slow down swimming (for example), if you can't actually
1800 * swim on that space, can't use it to avoid the penalty. 1804 * swim on that space, can't use it to avoid the penalty.
1801 */ 1805 */
1802 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1806 if (!op->flag [FLAG_WIZPASS])
1803 { 1807 {
1804 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1808 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1805 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1809 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806 { 1810 {
1807 float diff = tmp->move_slow_penalty * fabs (op->speed); 1811 float diff = tmp->move_slow_penalty * fabs (op->speed);
… …
1938void 1942void
1939flag_inv (object *op, int flag) 1943flag_inv (object *op, int flag)
1940{ 1944{
1941 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1945 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1942 { 1946 {
1943 SET_FLAG (tmp, flag); 1947 tmp->set_flag (flag);
1944 flag_inv (tmp, flag); 1948 flag_inv (tmp, flag);
1945 } 1949 }
1946} 1950}
1947 1951
1948/* 1952/*
… …
1951void 1955void
1952unflag_inv (object *op, int flag) 1956unflag_inv (object *op, int flag)
1953{ 1957{
1954 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1958 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1955 { 1959 {
1956 CLEAR_FLAG (tmp, flag); 1960 tmp->clr_flag (flag);
1957 unflag_inv (tmp, flag); 1961 unflag_inv (tmp, flag);
1958 } 1962 }
1959} 1963}
1960 1964
1961/* 1965/*
… …
2321 * Add a check so we can't pick up invisible objects (0.93.8) 2325 * Add a check so we can't pick up invisible objects (0.93.8)
2322 */ 2326 */
2323int 2327int
2324can_pick (const object *who, const object *item) 2328can_pick (const object *who, const object *item)
2325{ 2329{
2326 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2330 return /*who->flag [FLAG_WIZ]|| */
2327 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2331 (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2328 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); 2332 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2329} 2333}
2330 2334
2331/* 2335/*
2332 * create clone from object to another 2336 * create clone from object to another
2333 */ 2337 */

Diff Legend

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