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.317 by root, Fri Apr 2 03:41: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
596bool
597object::change_weapon (object *ob)
598{
599 if (current_weapon == ob)
600 return true;
601
602 if (current_weapon && current_weapon->flag [FLAG_APPLIED])
603 {
604 manual_apply (this, current_weapon, AP_UNAPPLY);
605
606 if (current_weapon && !current_weapon->flag [FLAG_APPLIED])//D
607 LOG (llevError, "FATAL: did not clear current_weapon (%s)\n", current_weapon->debug_desc ());
608
609 if (current_weapon && current_weapon->flag [FLAG_APPLIED])
610 return false;
611 }
612
613 current_weapon = 0;
614
615 if (ob && !ob->flag [FLAG_APPLIED])
616 {
617 manual_apply (this, ob, AP_APPLY);
618
619 if (ob->flag [FLAG_APPLIED])
620 current_weapon = ob;
621 else
622 return false;
623 }
624
625 return true;
626}
627
628/* Zero the key_values on op, decrementing the shared-string 579/* Zero the key_values on op, decrementing the shared-string
629 * refcounts and freeing the links. 580 * refcounts and freeing the links.
630 */ 581 */
631static void 582static void
632free_key_values (object *op) 583free_key_values (object *op)
… …
732 * 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.
733 */ 684 */
734void 685void
735update_turn_face (object *op) 686update_turn_face (object *op)
736{ 687{
737 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) 688 if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
738 return; 689 return;
739 690
740 SET_ANIMATION (op, op->direction); 691 SET_ANIMATION (op, op->direction);
741 update_object (op, UP_OBJ_FACE); 692 update_object (op, UP_OBJ_FACE);
742} 693}
… …
808 /* nop */; 759 /* nop */;
809 else if (action == UP_OBJ_INSERT) 760 else if (action == UP_OBJ_INSERT)
810 { 761 {
811#if 0 762#if 0
812 // this is likely overkill, TODO: revisit (schmorp) 763 // this is likely overkill, TODO: revisit (schmorp)
813 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 764 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
814 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 765 || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
815 || (op->is_player () && !(m.flags_ & P_PLAYER)) 766 || (op->is_player () && !(m.flags_ & P_PLAYER))
816 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 767 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
817 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 768 || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
818 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 769 || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
819 || (m.move_on | op->move_on ) != m.move_on 770 || (m.move_on | op->move_on ) != m.move_on
820 || (m.move_off | op->move_off ) != m.move_off 771 || (m.move_off | op->move_off ) != m.move_off
821 || (m.move_slow | op->move_slow) != m.move_slow 772 || (m.move_slow | op->move_slow) != m.move_slow
822 /* 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
823 * have move_allow right now. 774 * have move_allow right now.
… …
844 update_object (op->more, action); 795 update_object (op->more, action);
845} 796}
846 797
847object::object () 798object::object ()
848{ 799{
849 SET_FLAG (this, FLAG_REMOVED); 800 this->set_flag (FLAG_REMOVED);
850 801
851 //expmul = 1.0; declared const for the time being 802 //expmul = 1.0; declared const for the time being
852 face = blank_face; 803 face = blank_face;
853 material = MATERIAL_NULL; 804 material = MATERIAL_NULL;
854} 805}
… …
988 map->insert (op, x, y); 939 map->insert (op, x, y);
989 } 940 }
990 } 941 }
991} 942}
992 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
993object *object::create () 965object *object::create ()
994{ 966{
995 object *op = new object; 967 object *op = new object;
996 op->link (); 968 op->link ();
997 return op; 969 return op;
… …
1067 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1039 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1068 head->destroy (); 1040 head->destroy ();
1069 return; 1041 return;
1070 } 1042 }
1071 1043
1072 destroy_inv (false); 1044 destroy_inv_fast ();
1073 1045
1074 if (is_head ()) 1046 if (is_head ())
1075 if (sound_destroy) 1047 if (sound_destroy)
1076 play_sound (sound_destroy); 1048 play_sound (sound_destroy);
1077 else if (flag [FLAG_MONSTER]) 1049 else if (flag [FLAG_MONSTER])
… …
1177 else if (pl->container_ () == this) 1149 else if (pl->container_ () == this)
1178 { 1150 {
1179 // removing a container should close it 1151 // removing a container should close it
1180 close_container (); 1152 close_container ();
1181 } 1153 }
1182 1154 else
1183 esrv_del_item (pl->contr, count); 1155 esrv_del_item (pl->contr, count);
1184 } 1156 }
1185 1157
1186 /* link the object above us */ 1158 /* link the object above us */
1187 // re-link, make sure compiler can easily use cmove 1159 // re-link, make sure compiler can easily use cmove
1188 *(above ? &above->below : &ms.top) = below; 1160 *(above ? &above->below : &ms.top) = below;
… …
1374 // from here :/ 1346 // from here :/
1375 op->nrof += tmp->nrof; 1347 op->nrof += tmp->nrof;
1376 tmp->destroy (); 1348 tmp->destroy ();
1377 } 1349 }
1378 1350
1379 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 */
1380 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1352 op->clr_flag (FLAG_INV_LOCKED);
1381 1353
1382 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1354 if (!op->flag [FLAG_ALIVE])
1383 CLEAR_FLAG (op, FLAG_NO_STEAL); 1355 op->clr_flag (FLAG_NO_STEAL);
1384 1356
1385 if (flag & INS_BELOW_ORIGINATOR) 1357 if (flag & INS_BELOW_ORIGINATOR)
1386 { 1358 {
1387 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)
1388 { 1360 {
… …
1423 * 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
1424 * that flying non pickable objects are spell objects. 1396 * that flying non pickable objects are spell objects.
1425 */ 1397 */
1426 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1398 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1427 { 1399 {
1428 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])
1429 floor = tmp; 1401 floor = tmp;
1430 1402
1431 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])
1432 { 1404 {
1433 /* We insert above top, so we want this object below this */ 1405 /* We insert above top, so we want this object below this */
1434 top = tmp->below; 1406 top = tmp->below;
1435 break; 1407 break;
1436 } 1408 }
… …
1454 && (op->face && !faces [op->face].visibility)) 1426 && (op->face && !faces [op->face].visibility))
1455 { 1427 {
1456 object *last; 1428 object *last;
1457 1429
1458 for (last = top; last != floor; last = last->below) 1430 for (last = top; last != floor; last = last->below)
1459 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1431 if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1460 break; 1432 break;
1461 1433
1462 /* Check to see if we found the object that blocks view, 1434 /* Check to see if we found the object that blocks view,
1463 * 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
1464 * we can get inserted below this one, which requires we 1436 * we can get inserted below this one, which requires we
… …
1595 || (items < m->max_items 1567 || (items < m->max_items
1596 && ms.volume () < m->max_volume)) 1568 && ms.volume () < m->max_volume))
1597 return true; 1569 return true;
1598 1570
1599 if (originator && originator->is_player ()) 1571 if (originator && originator->is_player ())
1600 originator->contr->failmsg (format ( 1572 originator->contr->failmsgf (
1601 "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.>",
1602 query_name () 1574 query_name ()
1603 )); 1575 );
1604 1576
1605 return false; 1577 return false;
1606} 1578}
1607 1579
1608/* 1580/*
… …
1782 * on top. 1754 * on top.
1783 */ 1755 */
1784int 1756int
1785check_move_on (object *op, object *originator) 1757check_move_on (object *op, object *originator)
1786{ 1758{
1787 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1759 if (op->flag [FLAG_NO_APPLY])
1788 return 0; 1760 return 0;
1789 1761
1790 object *tmp; 1762 object *tmp;
1791 maptile *m = op->map; 1763 maptile *m = op->map;
1792 int x = op->x, y = op->y; 1764 int x = op->x, y = op->y;
… …
1829 * Second check makes sure that the movement types not being slowed 1801 * Second check makes sure that the movement types not being slowed
1830 * (~slow_move) is not blocked on this space - just because the 1802 * (~slow_move) is not blocked on this space - just because the
1831 * 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
1832 * 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.
1833 */ 1805 */
1834 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1806 if (!op->flag [FLAG_WIZPASS])
1835 { 1807 {
1836 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1808 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1837 ((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))
1838 { 1810 {
1839 float diff = tmp->move_slow_penalty * fabs (op->speed); 1811 float diff = tmp->move_slow_penalty * fabs (op->speed);
… …
1970void 1942void
1971flag_inv (object *op, int flag) 1943flag_inv (object *op, int flag)
1972{ 1944{
1973 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1945 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1974 { 1946 {
1975 SET_FLAG (tmp, flag); 1947 tmp->set_flag (flag);
1976 flag_inv (tmp, flag); 1948 flag_inv (tmp, flag);
1977 } 1949 }
1978} 1950}
1979 1951
1980/* 1952/*
… …
1983void 1955void
1984unflag_inv (object *op, int flag) 1956unflag_inv (object *op, int flag)
1985{ 1957{
1986 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1958 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1987 { 1959 {
1988 CLEAR_FLAG (tmp, flag); 1960 tmp->clr_flag (flag);
1989 unflag_inv (tmp, flag); 1961 unflag_inv (tmp, flag);
1990 } 1962 }
1991} 1963}
1992 1964
1993/* 1965/*
… …
2353 * 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)
2354 */ 2326 */
2355int 2327int
2356can_pick (const object *who, const object *item) 2328can_pick (const object *who, const object *item)
2357{ 2329{
2358 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2330 return /*who->flag [FLAG_WIZ]|| */
2359 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2331 (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2360 !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));
2361} 2333}
2362 2334
2363/* 2335/*
2364 * create clone from object to another 2336 * create clone from object to another
2365 */ 2337 */

Diff Legend

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