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.320 by root, Wed Apr 7 19:54:44 2010 UTC vs.
Revision 1.328 by root, Sun Apr 18 06:55:34 2010 UTC

… …
37uint32_t mapspace::smellcount = 10000; 37uint32_t mapspace::smellcount = 10000;
38 38
39objectvec objects; 39objectvec objects;
40activevec actives; 40activevec actives;
41 41
42freelist_item *object::freelist;
43uint32_t object::object_count;
44uint32_t object::free_count;
45uint32_t object::create_count;
46uint32_t object::destroy_count;
47
42//+GPL 48//+GPL
43 49
44short freearr_x[SIZEOFFREE] = { 50short freearr_x[SIZEOFFREE] = {
45 0, 51 0,
46 0, 1, 1, 1, 0, -1, -1, -1, 52 0, 1, 1, 1, 0, -1, -1, -1,
… …
266 * This is to the comparison of the flags below will be OK. We 272 * 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 273 * 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 274 * are not equal - just if it has been identified, the been_applied
269 * flags lose any meaning. 275 * flags lose any meaning.
270 */ 276 */
271 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 277 if (ob1->flag [FLAG_IDENTIFIED])
272 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 278 ob1->set_flag (FLAG_BEEN_APPLIED);
273 279
274 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 280 if (ob2->flag [FLAG_IDENTIFIED])
275 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 281 ob2->set_flag (FLAG_BEEN_APPLIED);
276 282
277 if (ob1->arch->archname != ob2->arch->archname 283 if (ob1->arch->archname != ob2->arch->archname
278 || ob1->name != ob2->name 284 || ob1->name != ob2->name
279 || ob1->title != ob2->title 285 || ob1->title != ob2->title
280 || ob1->msg != ob2->msg 286 || ob1->msg != ob2->msg
… …
329 335
330 /* Don't merge objects that are applied. With the new 'body' code, 336 /* 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 337 * 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. 338 * some items equipped, and we don't want those to merge.
333 */ 339 */
334 if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) 340 if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
335 return 0; 341 return 0;
336 342
337 /* Note sure why the following is the case - either the object has to 343 /* 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 344 * be animated or have a very low speed. Is this an attempted monster
339 * check? 345 * check?
340 */ 346 */
341 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) 347 if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
342 return 0; 348 return 0;
343 349
344 switch (ob1->type) 350 switch (ob1->type)
345 { 351 {
346 case SCROLL: 352 case SCROLL:
… …
477 483
478 sum = weight_adjust_for (this, sum); 484 sum = weight_adjust_for (this, sum);
479 485
480 if (sum != carrying) 486 if (sum != carrying)
481 { 487 {
488 if (carrying != sum)//D
489 LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n",
490 (long long)sum, (long long)carrying, debug_desc ());
491
482 carrying = sum; 492 carrying = sum;
483 493
484 if (object *pl = visible_to ()) 494 if (object *pl = visible_to ())
485 if (pl != this) // player is handled lazily 495 if (pl != this) // player is handled lazily
486 esrv_update_item (UPD_WEIGHT, pl, this); 496 esrv_update_item (UPD_WEIGHT, pl, this);
… …
683 * be called to update the face variable, _and_ how it looks on the map. 693 * be called to update the face variable, _and_ how it looks on the map.
684 */ 694 */
685void 695void
686update_turn_face (object *op) 696update_turn_face (object *op)
687{ 697{
688 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) 698 if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
689 return; 699 return;
690 700
691 SET_ANIMATION (op, op->direction); 701 SET_ANIMATION (op, op->direction);
692 update_object (op, UP_OBJ_FACE); 702 update_object (op, UP_OBJ_FACE);
693} 703}
… …
759 /* nop */; 769 /* nop */;
760 else if (action == UP_OBJ_INSERT) 770 else if (action == UP_OBJ_INSERT)
761 { 771 {
762#if 0 772#if 0
763 // this is likely overkill, TODO: revisit (schmorp) 773 // this is likely overkill, TODO: revisit (schmorp)
764 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 774 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
765 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 775 || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
766 || (op->is_player () && !(m.flags_ & P_PLAYER)) 776 || (op->is_player () && !(m.flags_ & P_PLAYER))
767 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 777 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
768 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 778 || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
769 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 779 || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
770 || (m.move_on | op->move_on ) != m.move_on 780 || (m.move_on | op->move_on ) != m.move_on
771 || (m.move_off | op->move_off ) != m.move_off 781 || (m.move_off | op->move_off ) != m.move_off
772 || (m.move_slow | op->move_slow) != m.move_slow 782 || (m.move_slow | op->move_slow) != m.move_slow
773 /* This isn't perfect, but I don't expect a lot of objects to 783 /* This isn't perfect, but I don't expect a lot of objects to
774 * have move_allow right now. 784 * have move_allow right now.
… …
795 update_object (op->more, action); 805 update_object (op->more, action);
796} 806}
797 807
798object::object () 808object::object ()
799{ 809{
800 SET_FLAG (this, FLAG_REMOVED); 810 this->set_flag (FLAG_REMOVED);
801 811
802 //expmul = 1.0; declared const for the time being 812 //expmul = 1.0; declared const for the time being
803 face = blank_face; 813 face = blank_face;
804 material = MATERIAL_NULL; 814 material = MATERIAL_NULL;
805} 815}
… …
809 unlink (); 819 unlink ();
810 820
811 free_key_values (this); 821 free_key_values (this);
812} 822}
813 823
814static int object_count;
815
816void object::link () 824void object::link ()
817{ 825{
818 assert (!index);//D 826 assert (!index);//D
819 uuid = UUID::gen (); 827 uuid = UUID::gen ();
820 count = ++object_count;
821 828
822 refcnt_inc (); 829 refcnt_inc ();
823 objects.insert (this); 830 objects.insert (this);
831
832 ++create_count;
833
824} 834}
825 835
826void object::unlink () 836void object::unlink ()
827{ 837{
828 if (!index) 838 if (!index)
829 return; 839 return;
840
841 ++destroy_count;
830 842
831 objects.erase (this); 843 objects.erase (this);
832 refcnt_dec (); 844 refcnt_dec ();
833} 845}
834 846
… …
960 // then destroy 972 // then destroy
961 op->destroy (); 973 op->destroy ();
962 } 974 }
963} 975}
964 976
977void
978object::freelist_free (int count)
979{
980 while (count-- && freelist)
981 {
982 freelist_item *next = freelist->next;
983 // count is being "destroyed"
984
985 sfree ((char *)freelist, sizeof (object));
986
987 freelist = next;
988 --free_count;
989 }
990}
991
992object *
965object *object::create () 993object::create ()
966{ 994{
967 object *op = new object; 995 object *op;
996
997 if (freelist)
998 {
999 freelist_item li = *freelist;
1000 memset (freelist, 0, sizeof (object));
1001
1002 op = new (freelist) object;
1003 op->count = li.count;
1004
1005 freelist = li.next;
1006 --free_count;
1007 }
1008 else
1009 {
1010 void *ni = salloc0<char> (sizeof (object));
1011
1012 op = new(ni) object;
1013
1014 op->count = ++object_count;
1015 }
1016
968 op->link (); 1017 op->link ();
1018
969 return op; 1019 return op;
970} 1020}
971 1021
1022void
1023object::do_delete ()
1024{
1025 uint32_t count = this->count;
1026
1027 this->~object ();
1028
1029 freelist_item *li = (freelist_item *)this;
1030 li->next = freelist;
1031 li->count = count;
1032
1033 freelist = li;
1034 ++free_count;
1035}
1036
972static struct freed_map : maptile 1037static struct freed_map : maptile
973{ 1038{
974 freed_map () 1039 freed_map ()
1040 : maptile (3, 3)
975 { 1041 {
976 path = "<freed objects map>"; 1042 path = "<freed objects map>";
977 name = "/internal/freed_objects_map"; 1043 name = "/internal/freed_objects_map";
978 width = 3;
979 height = 3;
980 no_drop = 1; 1044 no_drop = 1;
981 no_reset = 1; 1045 no_reset = 1;
982 1046
983 alloc ();
984 in_memory = MAP_ACTIVE; 1047 in_memory = MAP_ACTIVE;
985 } 1048 }
986 1049
987 ~freed_map () 1050 ~freed_map ()
988 { 1051 {
… …
1149 else if (pl->container_ () == this) 1212 else if (pl->container_ () == this)
1150 { 1213 {
1151 // removing a container should close it 1214 // removing a container should close it
1152 close_container (); 1215 close_container ();
1153 } 1216 }
1154 1217 else
1155 esrv_del_item (pl->contr, count); 1218 esrv_del_item (pl->contr, count);
1156 } 1219 }
1157 1220
1158 /* link the object above us */ 1221 /* link the object above us */
1159 // re-link, make sure compiler can easily use cmove 1222 // re-link, make sure compiler can easily use cmove
1160 *(above ? &above->below : &ms.top) = below; 1223 *(above ? &above->below : &ms.top) = below;
… …
1346 // from here :/ 1409 // from here :/
1347 op->nrof += tmp->nrof; 1410 op->nrof += tmp->nrof;
1348 tmp->destroy (); 1411 tmp->destroy ();
1349 } 1412 }
1350 1413
1351 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1414 op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1352 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1415 op->clr_flag (FLAG_INV_LOCKED);
1353 1416
1354 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1417 if (!op->flag [FLAG_ALIVE])
1355 CLEAR_FLAG (op, FLAG_NO_STEAL); 1418 op->clr_flag (FLAG_NO_STEAL);
1356 1419
1357 if (flag & INS_BELOW_ORIGINATOR) 1420 if (flag & INS_BELOW_ORIGINATOR)
1358 { 1421 {
1359 if (originator->map != op->map || originator->x != op->x || originator->y != op->y) 1422 if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1360 { 1423 {
… …
1395 * when lots of spells are cast in one area. Currently, it is presumed 1458 * when lots of spells are cast in one area. Currently, it is presumed
1396 * that flying non pickable objects are spell objects. 1459 * that flying non pickable objects are spell objects.
1397 */ 1460 */
1398 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1461 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1399 { 1462 {
1400 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) 1463 if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1401 floor = tmp; 1464 floor = tmp;
1402 1465
1403 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1466 if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1404 { 1467 {
1405 /* We insert above top, so we want this object below this */ 1468 /* We insert above top, so we want this object below this */
1406 top = tmp->below; 1469 top = tmp->below;
1407 break; 1470 break;
1408 } 1471 }
… …
1426 && (op->face && !faces [op->face].visibility)) 1489 && (op->face && !faces [op->face].visibility))
1427 { 1490 {
1428 object *last; 1491 object *last;
1429 1492
1430 for (last = top; last != floor; last = last->below) 1493 for (last = top; last != floor; last = last->below)
1431 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1494 if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1432 break; 1495 break;
1433 1496
1434 /* Check to see if we found the object that blocks view, 1497 /* Check to see if we found the object that blocks view,
1435 * and make sure we have a below pointer for it so that 1498 * and make sure we have a below pointer for it so that
1436 * we can get inserted below this one, which requires we 1499 * we can get inserted below this one, which requires we
… …
1567 || (items < m->max_items 1630 || (items < m->max_items
1568 && ms.volume () < m->max_volume)) 1631 && ms.volume () < m->max_volume))
1569 return true; 1632 return true;
1570 1633
1571 if (originator && originator->is_player ()) 1634 if (originator && originator->is_player ())
1572 originator->contr->failmsg (format ( 1635 originator->contr->failmsgf (
1573 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", 1636 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1574 query_name () 1637 query_name ()
1575 )); 1638 );
1576 1639
1577 return false; 1640 return false;
1578} 1641}
1579 1642
1580/* 1643/*
… …
1754 * on top. 1817 * on top.
1755 */ 1818 */
1756int 1819int
1757check_move_on (object *op, object *originator) 1820check_move_on (object *op, object *originator)
1758{ 1821{
1759 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1822 if (op->flag [FLAG_NO_APPLY])
1760 return 0; 1823 return 0;
1761 1824
1762 object *tmp; 1825 object *tmp;
1763 maptile *m = op->map; 1826 maptile *m = op->map;
1764 int x = op->x, y = op->y; 1827 int x = op->x, y = op->y;
… …
1801 * Second check makes sure that the movement types not being slowed 1864 * Second check makes sure that the movement types not being slowed
1802 * (~slow_move) is not blocked on this space - just because the 1865 * (~slow_move) is not blocked on this space - just because the
1803 * space doesn't slow down swimming (for example), if you can't actually 1866 * space doesn't slow down swimming (for example), if you can't actually
1804 * swim on that space, can't use it to avoid the penalty. 1867 * swim on that space, can't use it to avoid the penalty.
1805 */ 1868 */
1806 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1869 if (!op->flag [FLAG_WIZPASS])
1807 { 1870 {
1808 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1871 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1809 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1872 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1810 { 1873 {
1811 float diff = tmp->move_slow_penalty * fabs (op->speed); 1874 float diff = tmp->move_slow_penalty * fabs (op->speed);
… …
1942void 2005void
1943flag_inv (object *op, int flag) 2006flag_inv (object *op, int flag)
1944{ 2007{
1945 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2008 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1946 { 2009 {
1947 SET_FLAG (tmp, flag); 2010 tmp->set_flag (flag);
1948 flag_inv (tmp, flag); 2011 flag_inv (tmp, flag);
1949 } 2012 }
1950} 2013}
1951 2014
1952/* 2015/*
… …
1955void 2018void
1956unflag_inv (object *op, int flag) 2019unflag_inv (object *op, int flag)
1957{ 2020{
1958 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2021 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959 { 2022 {
1960 CLEAR_FLAG (tmp, flag); 2023 tmp->clr_flag (flag);
1961 unflag_inv (tmp, flag); 2024 unflag_inv (tmp, flag);
1962 } 2025 }
1963} 2026}
1964 2027
1965/* 2028/*
… …
2165find_dir_2 (int x, int y) 2228find_dir_2 (int x, int y)
2166{ 2229{
2167 int q; 2230 int q;
2168 2231
2169 if (y) 2232 if (y)
2170 q = x * 100 / y; 2233 q = 128 * x / y;
2171 else if (x) 2234 else if (x)
2172 q = -300 * x; 2235 q = 512 * x; // to make it > 309
2173 else 2236 else
2174 return 0; 2237 return 0;
2175 2238
2176 if (y > 0) 2239 if (y > 0)
2177 { 2240 {
2178 if (q < -242) 2241 if (q < -309) return 3;
2179 return 3; 2242 if (q < -52) return 2;
2180 if (q < -41) 2243 if (q < 52) return 1;
2181 return 2; 2244 if (q < 309) return 8;
2182 if (q < 41) 2245
2183 return 1;
2184 if (q < 242)
2185 return 8;
2186 return 7; 2246 return 7;
2187 } 2247 }
2248 else
2249 {
2250 if (q < -309) return 7;
2251 if (q < -52) return 6;
2252 if (q < 52) return 5;
2253 if (q < 309) return 4;
2188 2254
2189 if (q < -242)
2190 return 7; 2255 return 3;
2191 if (q < -41) 2256 }
2192 return 6;
2193 if (q < 41)
2194 return 5;
2195 if (q < 242)
2196 return 4;
2197
2198 return 3;
2199} 2257}
2200 2258
2201/* 2259/*
2202 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2260 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2203 * between two directions (which are expected to be absolute (see absdir()) 2261 * between two directions (which are expected to be absolute (see absdir())
2204 */ 2262 */
2205int 2263int
2206dirdiff (int dir1, int dir2) 2264dirdiff (int dir1, int dir2)
2207{ 2265{
2208 int d;
2209
2210 d = abs (dir1 - dir2); 2266 int d = abs (dir1 - dir2);
2211 if (d > 4)
2212 d = 8 - d;
2213 2267
2214 return d; 2268 return d > 4 ? 8 - d : d;
2215} 2269}
2216 2270
2217/* peterm: 2271/* peterm:
2218 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2272 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2219 * Basically, this is a table of directions, and what directions 2273 * Basically, this is a table of directions, and what directions
… …
2325 * Add a check so we can't pick up invisible objects (0.93.8) 2379 * Add a check so we can't pick up invisible objects (0.93.8)
2326 */ 2380 */
2327int 2381int
2328can_pick (const object *who, const object *item) 2382can_pick (const object *who, const object *item)
2329{ 2383{
2330 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2384 return /*who->flag [FLAG_WIZ]|| */
2331 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2385 (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2332 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); 2386 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2333} 2387}
2334 2388
2335/* 2389/*
2336 * create clone from object to another 2390 * create clone from object to another
2337 */ 2391 */
… …
2677 } 2731 }
2678 else 2732 else
2679 move_type = mt; 2733 move_type = mt;
2680} 2734}
2681 2735
2736/* object should be a player.
2737 * we return the object the player has marked with the 'mark' command
2738 * below. If no match is found (or object has changed), we return
2739 * NULL. We leave it up to the calling function to print messages if
2740 * nothing is found.
2741 */
2742object *
2743object::mark () const
2744{
2745 if (contr && contr->mark && contr->mark->env == this)
2746 return contr->mark;
2747 else
2748 return 0;
2749}
2750

Diff Legend

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