… | |
… | |
37 | uint32_t mapspace::smellcount = 10000; |
37 | uint32_t mapspace::smellcount = 10000; |
38 | |
38 | |
39 | objectvec objects; |
39 | objectvec objects; |
40 | activevec actives; |
40 | activevec actives; |
41 | |
41 | |
|
|
42 | freelist_item *object::freelist; |
|
|
43 | uint32_t object::object_count; |
|
|
44 | uint32_t object::free_count; |
|
|
45 | uint32_t object::create_count; |
|
|
46 | uint32_t object::destroy_count; |
|
|
47 | |
42 | //+GPL |
48 | //+GPL |
43 | |
49 | |
44 | short freearr_x[SIZEOFFREE] = { |
50 | short 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: |
… | |
… | |
420 | |
426 | |
421 | return 0; |
427 | return 0; |
422 | } |
428 | } |
423 | |
429 | |
424 | // adjust weight per container type ("of holding") |
430 | // adjust weight per container type ("of holding") |
425 | static sint32 |
431 | static uint32 |
426 | weight_adjust_for (object *op, sint32 weight) |
432 | weight_adjust_for (object *op, uint32 weight) |
427 | { |
433 | { |
428 | return op->type == CONTAINER |
434 | return op->type == CONTAINER |
429 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
435 | ? weight - weight * op->stats.Str / 100 |
430 | : weight; |
436 | : weight; |
431 | } |
437 | } |
432 | |
438 | |
433 | /* |
439 | /* |
434 | * adjust_weight(object, weight) adds the specified weight to an object, |
440 | * subtracts, then adds, the specified weight to an object, |
435 | * and also updates how much the environment(s) is/are carrying. |
441 | * and also updates how much the environment(s) is/are carrying. |
436 | */ |
442 | */ |
437 | static void |
443 | static void |
438 | adjust_weight (object *op, sint32 weight) |
444 | adjust_weight (object *op, sint32 sub, sint32 add) |
439 | { |
445 | { |
440 | while (op) |
446 | while (op) |
441 | { |
447 | { |
442 | // adjust by actual difference to account for rounding errors |
448 | sint32 ocarrying = op->carrying; |
443 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
|
|
444 | weight = weight_adjust_for (op, op->carrying) |
|
|
445 | - weight_adjust_for (op, op->carrying - weight); |
|
|
446 | |
449 | |
447 | if (!weight) |
450 | op->carrying -= weight_adjust_for (op, sub); |
448 | return; |
451 | op->carrying += weight_adjust_for (op, add); |
449 | |
|
|
450 | op->carrying += weight; |
|
|
451 | |
452 | |
452 | if (object *pl = op->visible_to ()) |
453 | if (object *pl = op->visible_to ()) |
453 | if (pl != op) // player is handled lazily |
454 | if (pl != op) // player is handled lazily |
454 | esrv_update_item (UPD_WEIGHT, pl, op); |
455 | esrv_update_item (UPD_WEIGHT, pl, op); |
455 | |
456 | |
|
|
457 | sub = ocarrying; |
|
|
458 | add = op->carrying; |
|
|
459 | |
456 | op = op->env; |
460 | op = op->env; |
457 | } |
461 | } |
458 | } |
462 | } |
459 | |
463 | |
460 | /* |
464 | /* |
… | |
… | |
467 | { |
471 | { |
468 | sint32 sum = 0; |
472 | sint32 sum = 0; |
469 | |
473 | |
470 | for (object *op = inv; op; op = op->below) |
474 | for (object *op = inv; op; op = op->below) |
471 | { |
475 | { |
472 | if (op->inv) |
|
|
473 | op->update_weight (); |
476 | op->update_weight (); |
474 | |
477 | |
475 | sum += op->total_weight (); |
478 | sum += weight_adjust_for (this, op->total_weight ()); |
476 | } |
479 | } |
477 | |
|
|
478 | sum = weight_adjust_for (this, sum); |
|
|
479 | |
480 | |
480 | if (sum != carrying) |
481 | if (sum != carrying) |
481 | { |
482 | { |
|
|
483 | if (carrying != sum && carrying)//D |
|
|
484 | LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n", |
|
|
485 | (long long)sum, (long long)carrying, debug_desc ()); |
|
|
486 | |
482 | carrying = sum; |
487 | carrying = sum; |
483 | |
488 | |
484 | if (object *pl = visible_to ()) |
489 | if (object *pl = visible_to ()) |
485 | if (pl != this) // player is handled lazily |
490 | if (pl != this) // player is handled lazily |
486 | esrv_update_item (UPD_WEIGHT, pl, this); |
491 | esrv_update_item (UPD_WEIGHT, pl, this); |
… | |
… | |
683 | * be called to update the face variable, _and_ how it looks on the map. |
688 | * be called to update the face variable, _and_ how it looks on the map. |
684 | */ |
689 | */ |
685 | void |
690 | void |
686 | update_turn_face (object *op) |
691 | update_turn_face (object *op) |
687 | { |
692 | { |
688 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) |
693 | if (!op->flag [FLAG_IS_TURNABLE] || !op->arch) |
689 | return; |
694 | return; |
690 | |
695 | |
691 | SET_ANIMATION (op, op->direction); |
696 | SET_ANIMATION (op, op->direction); |
692 | update_object (op, UP_OBJ_FACE); |
697 | update_object (op, UP_OBJ_FACE); |
693 | } |
698 | } |
… | |
… | |
759 | /* nop */; |
764 | /* nop */; |
760 | else if (action == UP_OBJ_INSERT) |
765 | else if (action == UP_OBJ_INSERT) |
761 | { |
766 | { |
762 | #if 0 |
767 | #if 0 |
763 | // this is likely overkill, TODO: revisit (schmorp) |
768 | // this is likely overkill, TODO: revisit (schmorp) |
764 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
769 | if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) |
765 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
770 | || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC)) |
766 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
771 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
767 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
772 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
768 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
773 | || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE)) |
769 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
774 | || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) |
770 | || (m.move_on | op->move_on ) != m.move_on |
775 | || (m.move_on | op->move_on ) != m.move_on |
771 | || (m.move_off | op->move_off ) != m.move_off |
776 | || (m.move_off | op->move_off ) != m.move_off |
772 | || (m.move_slow | op->move_slow) != m.move_slow |
777 | || (m.move_slow | op->move_slow) != m.move_slow |
773 | /* This isn't perfect, but I don't expect a lot of objects to |
778 | /* This isn't perfect, but I don't expect a lot of objects to |
774 | * have move_allow right now. |
779 | * have move_allow right now. |
… | |
… | |
795 | update_object (op->more, action); |
800 | update_object (op->more, action); |
796 | } |
801 | } |
797 | |
802 | |
798 | object::object () |
803 | object::object () |
799 | { |
804 | { |
800 | SET_FLAG (this, FLAG_REMOVED); |
805 | this->set_flag (FLAG_REMOVED); |
801 | |
806 | |
802 | //expmul = 1.0; declared const for the time being |
807 | //expmul = 1.0; declared const for the time being |
803 | face = blank_face; |
808 | face = blank_face; |
804 | material = MATERIAL_NULL; |
809 | material = MATERIAL_NULL; |
805 | } |
810 | } |
… | |
… | |
809 | unlink (); |
814 | unlink (); |
810 | |
815 | |
811 | free_key_values (this); |
816 | free_key_values (this); |
812 | } |
817 | } |
813 | |
818 | |
814 | static int object_count; |
|
|
815 | |
|
|
816 | void object::link () |
819 | void object::link () |
817 | { |
820 | { |
818 | assert (!index);//D |
821 | assert (!index);//D |
819 | uuid = UUID::gen (); |
822 | uuid = UUID::gen (); |
820 | count = ++object_count; |
|
|
821 | |
823 | |
822 | refcnt_inc (); |
824 | refcnt_inc (); |
823 | objects.insert (this); |
825 | objects.insert (this); |
|
|
826 | |
|
|
827 | ++create_count; |
|
|
828 | |
824 | } |
829 | } |
825 | |
830 | |
826 | void object::unlink () |
831 | void object::unlink () |
827 | { |
832 | { |
828 | if (!index) |
833 | if (!index) |
829 | return; |
834 | return; |
|
|
835 | |
|
|
836 | ++destroy_count; |
830 | |
837 | |
831 | objects.erase (this); |
838 | objects.erase (this); |
832 | refcnt_dec (); |
839 | refcnt_dec (); |
833 | } |
840 | } |
834 | |
841 | |
… | |
… | |
960 | // then destroy |
967 | // then destroy |
961 | op->destroy (); |
968 | op->destroy (); |
962 | } |
969 | } |
963 | } |
970 | } |
964 | |
971 | |
|
|
972 | void |
|
|
973 | object::freelist_free (int count) |
|
|
974 | { |
|
|
975 | while (count-- && freelist) |
|
|
976 | { |
|
|
977 | freelist_item *next = freelist->next; |
|
|
978 | // count is being "destroyed" |
|
|
979 | |
|
|
980 | sfree ((char *)freelist, sizeof (object)); |
|
|
981 | |
|
|
982 | freelist = next; |
|
|
983 | --free_count; |
|
|
984 | } |
|
|
985 | } |
|
|
986 | |
|
|
987 | object * |
965 | object *object::create () |
988 | object::create () |
966 | { |
989 | { |
967 | object *op = new object; |
990 | object *op; |
|
|
991 | |
|
|
992 | if (freelist) |
|
|
993 | { |
|
|
994 | freelist_item li = *freelist; |
|
|
995 | memset (freelist, 0, sizeof (object)); |
|
|
996 | |
|
|
997 | op = new (freelist) object; |
|
|
998 | op->count = li.count; |
|
|
999 | |
|
|
1000 | freelist = li.next; |
|
|
1001 | --free_count; |
|
|
1002 | } |
|
|
1003 | else |
|
|
1004 | { |
|
|
1005 | void *ni = salloc0<char> (sizeof (object)); |
|
|
1006 | |
|
|
1007 | op = new(ni) object; |
|
|
1008 | |
|
|
1009 | op->count = ++object_count; |
|
|
1010 | } |
|
|
1011 | |
968 | op->link (); |
1012 | op->link (); |
|
|
1013 | |
969 | return op; |
1014 | return op; |
970 | } |
1015 | } |
971 | |
1016 | |
|
|
1017 | void |
|
|
1018 | object::do_delete () |
|
|
1019 | { |
|
|
1020 | uint32_t count = this->count; |
|
|
1021 | |
|
|
1022 | this->~object (); |
|
|
1023 | |
|
|
1024 | freelist_item *li = (freelist_item *)this; |
|
|
1025 | li->next = freelist; |
|
|
1026 | li->count = count; |
|
|
1027 | |
|
|
1028 | freelist = li; |
|
|
1029 | ++free_count; |
|
|
1030 | } |
|
|
1031 | |
972 | static struct freed_map : maptile |
1032 | static struct freed_map : maptile |
973 | { |
1033 | { |
974 | freed_map () |
1034 | freed_map () |
|
|
1035 | : maptile (3, 3) |
975 | { |
1036 | { |
976 | path = "<freed objects map>"; |
1037 | path = "<freed objects map>"; |
977 | name = "/internal/freed_objects_map"; |
1038 | name = "/internal/freed_objects_map"; |
978 | width = 3; |
|
|
979 | height = 3; |
|
|
980 | no_drop = 1; |
1039 | no_drop = 1; |
981 | no_reset = 1; |
1040 | no_reset = 1; |
982 | |
1041 | |
983 | alloc (); |
|
|
984 | in_memory = MAP_ACTIVE; |
1042 | in_memory = MAP_ACTIVE; |
985 | } |
1043 | } |
986 | |
1044 | |
987 | ~freed_map () |
1045 | ~freed_map () |
988 | { |
1046 | { |
… | |
… | |
1081 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
1139 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
1082 | if (object *pl = visible_to ()) |
1140 | if (object *pl = visible_to ()) |
1083 | esrv_del_item (pl->contr, count); |
1141 | esrv_del_item (pl->contr, count); |
1084 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1142 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1085 | |
1143 | |
1086 | adjust_weight (env, -total_weight ()); |
1144 | adjust_weight (env, total_weight (), 0); |
1087 | |
1145 | |
1088 | object *pl = in_player (); |
1146 | object *pl = in_player (); |
1089 | |
1147 | |
1090 | /* we set up values so that it could be inserted into |
1148 | /* we set up values so that it could be inserted into |
1091 | * the map, but we don't actually do that - it is up |
1149 | * the map, but we don't actually do that - it is up |
… | |
… | |
1149 | else if (pl->container_ () == this) |
1207 | else if (pl->container_ () == this) |
1150 | { |
1208 | { |
1151 | // removing a container should close it |
1209 | // removing a container should close it |
1152 | close_container (); |
1210 | close_container (); |
1153 | } |
1211 | } |
1154 | |
1212 | else |
1155 | esrv_del_item (pl->contr, count); |
1213 | esrv_del_item (pl->contr, count); |
1156 | } |
1214 | } |
1157 | |
1215 | |
1158 | /* link the object above us */ |
1216 | /* link the object above us */ |
1159 | // re-link, make sure compiler can easily use cmove |
1217 | // re-link, make sure compiler can easily use cmove |
1160 | *(above ? &above->below : &ms.top) = below; |
1218 | *(above ? &above->below : &ms.top) = below; |
… | |
… | |
1346 | // from here :/ |
1404 | // from here :/ |
1347 | op->nrof += tmp->nrof; |
1405 | op->nrof += tmp->nrof; |
1348 | tmp->destroy (); |
1406 | tmp->destroy (); |
1349 | } |
1407 | } |
1350 | |
1408 | |
1351 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1409 | op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1352 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1410 | op->clr_flag (FLAG_INV_LOCKED); |
1353 | |
1411 | |
1354 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1412 | if (!op->flag [FLAG_ALIVE]) |
1355 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1413 | op->clr_flag (FLAG_NO_STEAL); |
1356 | |
1414 | |
1357 | if (flag & INS_BELOW_ORIGINATOR) |
1415 | if (flag & INS_BELOW_ORIGINATOR) |
1358 | { |
1416 | { |
1359 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1417 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1360 | { |
1418 | { |
… | |
… | |
1395 | * when lots of spells are cast in one area. Currently, it is presumed |
1453 | * when lots of spells are cast in one area. Currently, it is presumed |
1396 | * that flying non pickable objects are spell objects. |
1454 | * that flying non pickable objects are spell objects. |
1397 | */ |
1455 | */ |
1398 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1456 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1399 | { |
1457 | { |
1400 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1458 | if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR]) |
1401 | floor = tmp; |
1459 | floor = tmp; |
1402 | |
1460 | |
1403 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1461 | if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR]) |
1404 | { |
1462 | { |
1405 | /* We insert above top, so we want this object below this */ |
1463 | /* We insert above top, so we want this object below this */ |
1406 | top = tmp->below; |
1464 | top = tmp->below; |
1407 | break; |
1465 | break; |
1408 | } |
1466 | } |
… | |
… | |
1426 | && (op->face && !faces [op->face].visibility)) |
1484 | && (op->face && !faces [op->face].visibility)) |
1427 | { |
1485 | { |
1428 | object *last; |
1486 | object *last; |
1429 | |
1487 | |
1430 | for (last = top; last != floor; last = last->below) |
1488 | for (last = top; last != floor; last = last->below) |
1431 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1489 | if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT)) |
1432 | break; |
1490 | break; |
1433 | |
1491 | |
1434 | /* Check to see if we found the object that blocks view, |
1492 | /* Check to see if we found the object that blocks view, |
1435 | * and make sure we have a below pointer for it so that |
1493 | * and make sure we have a below pointer for it so that |
1436 | * we can get inserted below this one, which requires we |
1494 | * we can get inserted below this one, which requires we |
… | |
… | |
1509 | */ |
1567 | */ |
1510 | |
1568 | |
1511 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1569 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1512 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1570 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1513 | { |
1571 | { |
1514 | if (check_move_on (op, originator)) |
1572 | if (check_move_on (op, originator, flag)) |
1515 | return 0; |
1573 | return 0; |
1516 | |
1574 | |
1517 | /* If we are a multi part object, lets work our way through the check |
1575 | /* If we are a multi part object, let's work our way through the check |
1518 | * walk on's. |
1576 | * walk on's. |
1519 | */ |
1577 | */ |
1520 | for (object *tmp = op->more; tmp; tmp = tmp->more) |
1578 | for (object *tmp = op->more; tmp; tmp = tmp->more) |
1521 | if (check_move_on (tmp, originator)) |
1579 | if (check_move_on (tmp, originator, flag)) |
1522 | return 0; |
1580 | return 0; |
1523 | } |
1581 | } |
1524 | |
1582 | |
1525 | return op; |
1583 | return op; |
1526 | } |
1584 | } |
… | |
… | |
1567 | || (items < m->max_items |
1625 | || (items < m->max_items |
1568 | && ms.volume () < m->max_volume)) |
1626 | && ms.volume () < m->max_volume)) |
1569 | return true; |
1627 | return true; |
1570 | |
1628 | |
1571 | if (originator && originator->is_player ()) |
1629 | if (originator && originator->is_player ()) |
1572 | originator->contr->failmsg (format ( |
1630 | 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.>", |
1631 | "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 () |
1632 | query_name () |
1575 | )); |
1633 | ); |
1576 | |
1634 | |
1577 | return false; |
1635 | return false; |
1578 | } |
1636 | } |
1579 | |
1637 | |
1580 | /* |
1638 | /* |
… | |
… | |
1592 | |
1650 | |
1593 | nr = min (nr, nrof); |
1651 | nr = min (nr, nrof); |
1594 | |
1652 | |
1595 | if (nrof > nr) |
1653 | if (nrof > nr) |
1596 | { |
1654 | { |
|
|
1655 | sint64 oweight = total_weight (); |
|
|
1656 | |
1597 | nrof -= nr; |
1657 | nrof -= nr; |
1598 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
|
|
1599 | |
1658 | |
1600 | if (object *pl = visible_to ()) |
1659 | if (object *pl = visible_to ()) |
1601 | esrv_update_item (UPD_NROF, pl, this); |
1660 | esrv_update_item (UPD_NROF, pl, this); |
|
|
1661 | |
|
|
1662 | adjust_weight (env, oweight, total_weight ()); |
1602 | |
1663 | |
1603 | return true; |
1664 | return true; |
1604 | } |
1665 | } |
1605 | else |
1666 | else |
1606 | { |
1667 | { |
… | |
… | |
1681 | if (op->nrof) |
1742 | if (op->nrof) |
1682 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1743 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1683 | if (object::can_merge (tmp, op)) |
1744 | if (object::can_merge (tmp, op)) |
1684 | { |
1745 | { |
1685 | /* return the original object and remove inserted object |
1746 | /* return the original object and remove inserted object |
1686 | (client needs the original object) */ |
1747 | (client prefers the original object) */ |
|
|
1748 | |
|
|
1749 | // carring must be 0 for mergable objects |
|
|
1750 | sint64 oweight = tmp->weight * tmp->nrof; |
|
|
1751 | |
1687 | tmp->nrof += op->nrof; |
1752 | tmp->nrof += op->nrof; |
1688 | |
1753 | |
1689 | if (object *pl = tmp->visible_to ()) |
1754 | if (object *pl = tmp->visible_to ()) |
1690 | esrv_update_item (UPD_NROF, pl, tmp); |
1755 | esrv_update_item (UPD_NROF, pl, tmp); |
1691 | |
1756 | |
1692 | adjust_weight (this, op->total_weight ()); |
1757 | adjust_weight (this, oweight, tmp->weight * tmp->nrof); |
1693 | |
1758 | |
1694 | op->destroy (); |
1759 | op->destroy (); |
1695 | op = tmp; |
1760 | op = tmp; |
1696 | goto inserted; |
1761 | goto inserted; |
1697 | } |
1762 | } |
… | |
… | |
1713 | op->flag [FLAG_REMOVED] = 0; |
1778 | op->flag [FLAG_REMOVED] = 0; |
1714 | |
1779 | |
1715 | if (object *pl = op->visible_to ()) |
1780 | if (object *pl = op->visible_to ()) |
1716 | esrv_send_item (pl, op); |
1781 | esrv_send_item (pl, op); |
1717 | |
1782 | |
1718 | adjust_weight (this, op->total_weight ()); |
1783 | adjust_weight (this, 0, op->total_weight ()); |
1719 | |
1784 | |
1720 | inserted: |
1785 | inserted: |
1721 | /* reset the light list and los of the players on the map */ |
1786 | /* reset the light list and los of the players on the map */ |
1722 | if (op->glow_radius && is_on_map ()) |
1787 | if (op->glow_radius && is_on_map ()) |
1723 | { |
1788 | { |
… | |
… | |
1752 | * MSW 2001-07-08: Check all objects on space, not just those below |
1817 | * MSW 2001-07-08: Check all objects on space, not just those below |
1753 | * object being inserted. insert_ob_in_map may not put new objects |
1818 | * object being inserted. insert_ob_in_map may not put new objects |
1754 | * on top. |
1819 | * on top. |
1755 | */ |
1820 | */ |
1756 | int |
1821 | int |
1757 | check_move_on (object *op, object *originator) |
1822 | check_move_on (object *op, object *originator, int flags) |
1758 | { |
1823 | { |
1759 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1824 | if (op->flag [FLAG_NO_APPLY]) |
1760 | return 0; |
1825 | return 0; |
1761 | |
1826 | |
1762 | object *tmp; |
1827 | object *tmp; |
1763 | maptile *m = op->map; |
1828 | maptile *m = op->map; |
1764 | int x = op->x, y = op->y; |
1829 | int x = op->x, y = op->y; |
… | |
… | |
1801 | * Second check makes sure that the movement types not being slowed |
1866 | * Second check makes sure that the movement types not being slowed |
1802 | * (~slow_move) is not blocked on this space - just because the |
1867 | * (~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 |
1868 | * 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. |
1869 | * swim on that space, can't use it to avoid the penalty. |
1805 | */ |
1870 | */ |
1806 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1871 | if (!op->flag [FLAG_WIZPASS]) |
1807 | { |
1872 | { |
1808 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1873 | 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)) |
1874 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1810 | { |
1875 | { |
1811 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1876 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
… | |
… | |
1821 | |
1886 | |
1822 | /* Basically same logic as above, except now for actual apply. */ |
1887 | /* Basically same logic as above, except now for actual apply. */ |
1823 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1888 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1824 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1889 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1825 | { |
1890 | { |
|
|
1891 | if ((flags & INS_NO_AUTO_EXIT) |
|
|
1892 | && (tmp->type == EXIT || tmp->type == TELEPORTER |
|
|
1893 | || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead |
|
|
1894 | continue; |
|
|
1895 | |
1826 | move_apply (tmp, op, originator); |
1896 | move_apply (tmp, op, originator); |
1827 | |
1897 | |
1828 | if (op->destroyed ()) |
1898 | if (op->destroyed ()) |
1829 | return 1; |
1899 | return 1; |
1830 | |
1900 | |
… | |
… | |
1942 | void |
2012 | void |
1943 | flag_inv (object *op, int flag) |
2013 | flag_inv (object *op, int flag) |
1944 | { |
2014 | { |
1945 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2015 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1946 | { |
2016 | { |
1947 | SET_FLAG (tmp, flag); |
2017 | tmp->set_flag (flag); |
1948 | flag_inv (tmp, flag); |
2018 | flag_inv (tmp, flag); |
1949 | } |
2019 | } |
1950 | } |
2020 | } |
1951 | |
2021 | |
1952 | /* |
2022 | /* |
… | |
… | |
1955 | void |
2025 | void |
1956 | unflag_inv (object *op, int flag) |
2026 | unflag_inv (object *op, int flag) |
1957 | { |
2027 | { |
1958 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2028 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1959 | { |
2029 | { |
1960 | CLEAR_FLAG (tmp, flag); |
2030 | tmp->clr_flag (flag); |
1961 | unflag_inv (tmp, flag); |
2031 | unflag_inv (tmp, flag); |
1962 | } |
2032 | } |
1963 | } |
2033 | } |
1964 | |
2034 | |
1965 | /* |
2035 | /* |
… | |
… | |
2155 | { |
2225 | { |
2156 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2226 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2157 | } |
2227 | } |
2158 | |
2228 | |
2159 | /* |
2229 | /* |
2160 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2230 | * find_dir_2(delta-x,delta-y) will return a direction value |
2161 | * an object which has subtracted the x and y coordinates of another |
2231 | * for running into direct [dx, dy]. |
2162 | * object, needs to travel toward it. |
2232 | * (the opposite of crossfire's find_dir_2!) |
2163 | */ |
2233 | */ |
2164 | int |
2234 | int |
2165 | find_dir_2 (int x, int y) |
2235 | find_dir_2 (int x, int y) |
2166 | { |
2236 | { |
|
|
2237 | #if 1 // new algorithm |
|
|
2238 | // this works by putting x, y into 16 sectors, which |
|
|
2239 | // are not equal sized, but are a better approximation |
|
|
2240 | // then the old algorithm, and then using a mapping |
|
|
2241 | // table to map it into a direction value. |
|
|
2242 | // basically, it maps these comparisons to each bit |
|
|
2243 | // bit #3: x < 0 |
|
|
2244 | // bit #2: y < 0 |
|
|
2245 | // bit #1: x > y |
|
|
2246 | // bit #0: x > 2y |
|
|
2247 | |
|
|
2248 | static const uint8 dir[16] = { |
|
|
2249 | 4, 5, 4, 3, |
|
|
2250 | 2, 1, 2, 3, |
|
|
2251 | 6, 5, 6, 7, |
|
|
2252 | 8, 1, 8, 7, |
|
|
2253 | }; |
|
|
2254 | int sector = 0; |
|
|
2255 | |
|
|
2256 | // this is a bit ugly, but more likely to result in branchless code |
|
|
2257 | sector |= x < 0 ? 8 : 0; |
|
|
2258 | x = x < 0 ? -x : x; // abs |
|
|
2259 | |
|
|
2260 | sector |= y < 0 ? 4 : 0; |
|
|
2261 | y = y < 0 ? -y : y; // abs |
|
|
2262 | |
|
|
2263 | if (x > y) |
|
|
2264 | { |
|
|
2265 | sector |= 2; |
|
|
2266 | |
|
|
2267 | if (x > y * 2) |
|
|
2268 | sector |= 1; |
|
|
2269 | } |
|
|
2270 | else |
|
|
2271 | { |
|
|
2272 | if (y > x * 2) |
|
|
2273 | sector |= 1; |
|
|
2274 | else if (!y) |
|
|
2275 | return 0; // x == 0 here |
|
|
2276 | } |
|
|
2277 | |
|
|
2278 | return dir [sector]; |
|
|
2279 | #else // old algorithm |
2167 | int q; |
2280 | int q; |
2168 | |
2281 | |
2169 | if (y) |
2282 | if (y) |
2170 | q = x * 100 / y; |
2283 | q = 128 * x / y; |
2171 | else if (x) |
2284 | else if (x) |
2172 | q = -300 * x; |
2285 | q = -512 * x; // to make it > 309 |
2173 | else |
2286 | else |
2174 | return 0; |
2287 | return 0; |
2175 | |
2288 | |
2176 | if (y > 0) |
2289 | if (y > 0) |
2177 | { |
2290 | { |
2178 | if (q < -242) |
2291 | if (q < -309) return 7; |
|
|
2292 | if (q < -52) return 6; |
|
|
2293 | if (q < 52) return 5; |
|
|
2294 | if (q < 309) return 4; |
|
|
2295 | |
2179 | return 3; |
2296 | return 3; |
2180 | if (q < -41) |
2297 | } |
2181 | return 2; |
2298 | else |
2182 | if (q < 41) |
2299 | { |
2183 | return 1; |
2300 | if (q < -309) return 3; |
2184 | if (q < 242) |
2301 | if (q < -52) return 2; |
2185 | return 8; |
2302 | if (q < 52) return 1; |
|
|
2303 | if (q < 309) return 8; |
|
|
2304 | |
2186 | return 7; |
2305 | return 7; |
2187 | } |
2306 | } |
2188 | |
2307 | #endif |
2189 | if (q < -242) |
|
|
2190 | return 7; |
|
|
2191 | if (q < -41) |
|
|
2192 | return 6; |
|
|
2193 | if (q < 41) |
|
|
2194 | return 5; |
|
|
2195 | if (q < 242) |
|
|
2196 | return 4; |
|
|
2197 | |
|
|
2198 | return 3; |
|
|
2199 | } |
2308 | } |
2200 | |
2309 | |
2201 | /* |
2310 | /* |
2202 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2311 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2203 | * between two directions (which are expected to be absolute (see absdir()) |
2312 | * between two directions (which are expected to be absolute (see absdir()) |
2204 | */ |
2313 | */ |
2205 | int |
2314 | int |
2206 | dirdiff (int dir1, int dir2) |
2315 | dirdiff (int dir1, int dir2) |
2207 | { |
2316 | { |
2208 | int d; |
|
|
2209 | |
|
|
2210 | d = abs (dir1 - dir2); |
2317 | int d = abs (dir1 - dir2); |
2211 | if (d > 4) |
|
|
2212 | d = 8 - d; |
|
|
2213 | |
2318 | |
2214 | return d; |
2319 | return d > 4 ? 8 - d : d; |
2215 | } |
2320 | } |
2216 | |
2321 | |
2217 | /* peterm: |
2322 | /* peterm: |
2218 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2323 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2219 | * Basically, this is a table of directions, and what directions |
2324 | * 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) |
2430 | * Add a check so we can't pick up invisible objects (0.93.8) |
2326 | */ |
2431 | */ |
2327 | int |
2432 | int |
2328 | can_pick (const object *who, const object *item) |
2433 | can_pick (const object *who, const object *item) |
2329 | { |
2434 | { |
2330 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2435 | return /*who->flag [FLAG_WIZ]|| */ |
2331 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2436 | (item->weight > 0 && !item->flag [FLAG_NO_PICK] && |
2332 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2437 | !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2333 | } |
2438 | } |
2334 | |
2439 | |
2335 | /* |
2440 | /* |
2336 | * create clone from object to another |
2441 | * create clone from object to another |
2337 | */ |
2442 | */ |
… | |
… | |
2677 | } |
2782 | } |
2678 | else |
2783 | else |
2679 | move_type = mt; |
2784 | move_type = mt; |
2680 | } |
2785 | } |
2681 | |
2786 | |
|
|
2787 | /* object should be a player. |
|
|
2788 | * we return the object the player has marked with the 'mark' command |
|
|
2789 | * below. If no match is found (or object has changed), we return |
|
|
2790 | * NULL. We leave it up to the calling function to print messages if |
|
|
2791 | * nothing is found. |
|
|
2792 | */ |
|
|
2793 | object * |
|
|
2794 | object::mark () const |
|
|
2795 | { |
|
|
2796 | if (contr && contr->mark && contr->mark->env == this) |
|
|
2797 | return contr->mark; |
|
|
2798 | else |
|
|
2799 | return 0; |
|
|
2800 | } |
|
|
2801 | |