… | |
… | |
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, |
… | |
… | |
65 | 9, 10, 13, 14, 17, 18, 21, 22, |
71 | 9, 10, 13, 14, 17, 18, 21, 22, |
66 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
72 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
67 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
73 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
68 | }; |
74 | }; |
69 | |
75 | |
|
|
76 | const char *wall_suffix[16] = { |
|
|
77 | "0", |
|
|
78 | "1_3", |
|
|
79 | "1_4", |
|
|
80 | "2_1_2", |
|
|
81 | "1_2", |
|
|
82 | "2_2_4", |
|
|
83 | "2_2_1", |
|
|
84 | "3_1", |
|
|
85 | "1_1", |
|
|
86 | "2_2_3", |
|
|
87 | "2_2_2", |
|
|
88 | "3_3", |
|
|
89 | "2_1_1", |
|
|
90 | "3_4", |
|
|
91 | "3_2", |
|
|
92 | "4" |
|
|
93 | }; |
|
|
94 | |
70 | static void |
95 | static void |
71 | write_uuid (uval64 skip, bool sync) |
96 | write_uuid (uval64 skip, bool sync) |
72 | { |
97 | { |
73 | CALL_BEGIN (2); |
98 | CALL_BEGIN (2); |
74 | CALL_ARG_SV (newSVval64 (skip)); |
99 | CALL_ARG_SV (newSVval64 (skip)); |
… | |
… | |
249 | */ |
274 | */ |
250 | bool object::can_merge_slow (object *ob1, object *ob2) |
275 | bool object::can_merge_slow (object *ob1, object *ob2) |
251 | { |
276 | { |
252 | /* A couple quick sanity checks */ |
277 | /* A couple quick sanity checks */ |
253 | if (ob1 == ob2 |
278 | if (ob1 == ob2 |
254 | || ob1->type != ob2->type |
279 | || ob1->type != ob2->type |
255 | || ob1->value != ob2->value |
280 | || ob1->value != ob2->value |
256 | || ob1->name != ob2->name |
281 | || ob1->name != ob2->name |
|
|
282 | || ob1->custom_name != ob2->custom_name |
257 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED) |
283 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED) |
258 | return 0; |
284 | return 0; |
259 | |
285 | |
260 | /* Do not merge objects if nrof would overflow, assume nrof |
286 | /* Do not merge objects if nrof would overflow, assume nrof |
261 | * is always 0 .. 2**31-1 */ |
287 | * is always 0 .. 2**31-1 */ |
… | |
… | |
266 | * This is to the comparison of the flags below will be OK. We |
292 | * 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 |
293 | * 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 |
294 | * are not equal - just if it has been identified, the been_applied |
269 | * flags lose any meaning. |
295 | * flags lose any meaning. |
270 | */ |
296 | */ |
271 | if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) |
297 | if (ob1->flag [FLAG_IDENTIFIED]) |
272 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
298 | ob1->set_flag (FLAG_BEEN_APPLIED); |
273 | |
299 | |
274 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
300 | if (ob2->flag [FLAG_IDENTIFIED]) |
275 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
301 | ob2->set_flag (FLAG_BEEN_APPLIED); |
276 | |
302 | |
277 | if (ob1->arch->archname != ob2->arch->archname |
303 | if (ob1->arch->archname != ob2->arch->archname |
278 | || ob1->name != ob2->name |
304 | || ob1->name != ob2->name |
279 | || ob1->title != ob2->title |
305 | || ob1->title != ob2->title |
280 | || ob1->msg != ob2->msg |
306 | || ob1->msg != ob2->msg |
… | |
… | |
329 | |
355 | |
330 | /* Don't merge objects that are applied. With the new 'body' code, |
356 | /* 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 |
357 | * 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. |
358 | * some items equipped, and we don't want those to merge. |
333 | */ |
359 | */ |
334 | if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) |
360 | if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) |
335 | return 0; |
361 | return 0; |
336 | |
362 | |
337 | /* Note sure why the following is the case - either the object has to |
363 | /* 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 |
364 | * be animated or have a very low speed. Is this an attempted monster |
339 | * check? |
365 | * check? |
340 | */ |
366 | */ |
341 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) |
367 | if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) |
342 | return 0; |
368 | return 0; |
343 | |
369 | |
344 | switch (ob1->type) |
370 | switch (ob1->type) |
345 | { |
371 | { |
346 | case SCROLL: |
372 | case SCROLL: |
… | |
… | |
420 | |
446 | |
421 | return 0; |
447 | return 0; |
422 | } |
448 | } |
423 | |
449 | |
424 | // adjust weight per container type ("of holding") |
450 | // adjust weight per container type ("of holding") |
425 | static sint32 |
451 | static uint32 |
426 | weight_adjust_for (object *op, sint32 weight) |
452 | weight_adjust_for (object *op, uint32 weight) |
427 | { |
453 | { |
428 | return op->type == CONTAINER |
454 | return op->type == CONTAINER |
429 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
455 | ? weight - weight * op->stats.Str / 100 |
430 | : weight; |
456 | : weight; |
431 | } |
457 | } |
432 | |
458 | |
433 | /* |
459 | /* |
434 | * adjust_weight(object, weight) adds the specified weight to an object, |
460 | * subtracts, then adds, the specified weight to an object, |
435 | * and also updates how much the environment(s) is/are carrying. |
461 | * and also updates how much the environment(s) is/are carrying. |
436 | */ |
462 | */ |
437 | static void |
463 | static void |
438 | adjust_weight (object *op, sint32 weight) |
464 | adjust_weight (object *op, sint32 sub, sint32 add) |
439 | { |
465 | { |
440 | while (op) |
466 | while (op) |
441 | { |
467 | { |
442 | // adjust by actual difference to account for rounding errors |
468 | 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 | |
469 | |
447 | if (!weight) |
470 | op->carrying -= weight_adjust_for (op, sub); |
448 | return; |
471 | op->carrying += weight_adjust_for (op, add); |
449 | |
|
|
450 | op->carrying += weight; |
|
|
451 | |
472 | |
452 | if (object *pl = op->visible_to ()) |
473 | if (object *pl = op->visible_to ()) |
453 | if (pl != op) // player is handled lazily |
474 | if (pl != op) // player is handled lazily |
454 | esrv_update_item (UPD_WEIGHT, pl, op); |
475 | esrv_update_item (UPD_WEIGHT, pl, op); |
455 | |
476 | |
|
|
477 | sub = ocarrying; |
|
|
478 | add = op->carrying; |
|
|
479 | |
456 | op = op->env; |
480 | op = op->env; |
457 | } |
481 | } |
458 | } |
482 | } |
459 | |
483 | |
460 | /* |
484 | /* |
… | |
… | |
467 | { |
491 | { |
468 | sint32 sum = 0; |
492 | sint32 sum = 0; |
469 | |
493 | |
470 | for (object *op = inv; op; op = op->below) |
494 | for (object *op = inv; op; op = op->below) |
471 | { |
495 | { |
472 | if (op->inv) |
|
|
473 | op->update_weight (); |
496 | op->update_weight (); |
474 | |
497 | |
475 | sum += op->total_weight (); |
498 | sum += weight_adjust_for (this, op->total_weight ()); |
476 | } |
499 | } |
477 | |
|
|
478 | sum = weight_adjust_for (this, sum); |
|
|
479 | |
500 | |
480 | if (sum != carrying) |
501 | if (sum != carrying) |
481 | { |
502 | { |
|
|
503 | if (carrying != sum && carrying)//D |
|
|
504 | LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n", |
|
|
505 | (long long)sum, (long long)carrying, debug_desc ()); |
|
|
506 | |
482 | carrying = sum; |
507 | carrying = sum; |
483 | |
508 | |
484 | if (object *pl = visible_to ()) |
509 | if (object *pl = visible_to ()) |
485 | if (pl != this) // player is handled lazily |
510 | if (pl != this) // player is handled lazily |
486 | esrv_update_item (UPD_WEIGHT, pl, this); |
511 | esrv_update_item (UPD_WEIGHT, pl, this); |
… | |
… | |
643 | object::instantiate () |
668 | object::instantiate () |
644 | { |
669 | { |
645 | if (!uuid.seq) // HACK |
670 | if (!uuid.seq) // HACK |
646 | uuid = UUID::gen (); |
671 | uuid = UUID::gen (); |
647 | |
672 | |
648 | // TODO: unclean state changes, should nt be done in copy_to AND instantiate |
673 | // TODO: unclean state changes, should not be done in copy_to AND instantiate |
649 | if (flag [FLAG_RANDOM_SPEED] && speed) |
674 | if (flag [FLAG_RANDOM_SPEED] && speed) |
650 | speed_left = - speed - rndm (); // TODO animation |
675 | speed_left = - speed - rndm (); // TODO animation |
651 | else |
676 | else |
652 | speed_left = -1.; |
677 | speed_left = -1.; |
653 | |
678 | |
… | |
… | |
683 | * be called to update the face variable, _and_ how it looks on the map. |
708 | * be called to update the face variable, _and_ how it looks on the map. |
684 | */ |
709 | */ |
685 | void |
710 | void |
686 | update_turn_face (object *op) |
711 | update_turn_face (object *op) |
687 | { |
712 | { |
688 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) |
713 | if (!op->flag [FLAG_IS_TURNABLE] || !op->arch) |
689 | return; |
714 | return; |
690 | |
715 | |
691 | SET_ANIMATION (op, op->direction); |
716 | SET_ANIMATION (op, op->direction); |
692 | update_object (op, UP_OBJ_FACE); |
717 | update_object (op, UP_OBJ_FACE); |
693 | } |
718 | } |
… | |
… | |
759 | /* nop */; |
784 | /* nop */; |
760 | else if (action == UP_OBJ_INSERT) |
785 | else if (action == UP_OBJ_INSERT) |
761 | { |
786 | { |
762 | #if 0 |
787 | #if 0 |
763 | // this is likely overkill, TODO: revisit (schmorp) |
788 | // this is likely overkill, TODO: revisit (schmorp) |
764 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
789 | if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) |
765 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
790 | || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC)) |
766 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
791 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
767 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
792 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
768 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
793 | || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE)) |
769 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
794 | || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) |
770 | || (m.move_on | op->move_on ) != m.move_on |
795 | || (m.move_on | op->move_on ) != m.move_on |
771 | || (m.move_off | op->move_off ) != m.move_off |
796 | || (m.move_off | op->move_off ) != m.move_off |
772 | || (m.move_slow | op->move_slow) != m.move_slow |
797 | || (m.move_slow | op->move_slow) != m.move_slow |
773 | /* This isn't perfect, but I don't expect a lot of objects to |
798 | /* This isn't perfect, but I don't expect a lot of objects to |
774 | * have move_allow right now. |
799 | * have move_allow right now. |
… | |
… | |
795 | update_object (op->more, action); |
820 | update_object (op->more, action); |
796 | } |
821 | } |
797 | |
822 | |
798 | object::object () |
823 | object::object () |
799 | { |
824 | { |
800 | SET_FLAG (this, FLAG_REMOVED); |
825 | this->set_flag (FLAG_REMOVED); |
801 | |
826 | |
802 | //expmul = 1.0; declared const for the time being |
827 | //expmul = 1.0; declared const for the time being |
803 | face = blank_face; |
828 | face = blank_face; |
804 | material = MATERIAL_NULL; |
829 | material = MATERIAL_NULL; |
805 | } |
830 | } |
… | |
… | |
809 | unlink (); |
834 | unlink (); |
810 | |
835 | |
811 | free_key_values (this); |
836 | free_key_values (this); |
812 | } |
837 | } |
813 | |
838 | |
814 | static int object_count; |
|
|
815 | |
|
|
816 | void object::link () |
839 | void object::link () |
817 | { |
840 | { |
818 | assert (!index);//D |
841 | assert (!index);//D |
819 | uuid = UUID::gen (); |
842 | uuid = UUID::gen (); |
820 | count = ++object_count; |
|
|
821 | |
843 | |
822 | refcnt_inc (); |
844 | refcnt_inc (); |
823 | objects.insert (this); |
845 | objects.insert (this); |
|
|
846 | |
|
|
847 | ++create_count; |
|
|
848 | |
824 | } |
849 | } |
825 | |
850 | |
826 | void object::unlink () |
851 | void object::unlink () |
827 | { |
852 | { |
828 | if (!index) |
853 | if (!index) |
829 | return; |
854 | return; |
|
|
855 | |
|
|
856 | ++destroy_count; |
830 | |
857 | |
831 | objects.erase (this); |
858 | objects.erase (this); |
832 | refcnt_dec (); |
859 | refcnt_dec (); |
833 | } |
860 | } |
834 | |
861 | |
… | |
… | |
939 | map->insert (op, x, y); |
966 | map->insert (op, x, y); |
940 | } |
967 | } |
941 | } |
968 | } |
942 | } |
969 | } |
943 | |
970 | |
|
|
971 | /* |
|
|
972 | * Remove and free all objects in the inventory of the given object. |
|
|
973 | * Unlike destroy_inv, this assumes the *this is destroyed as well |
|
|
974 | * well, so we can (and have to!) take shortcuts. |
|
|
975 | */ |
|
|
976 | void |
|
|
977 | object::destroy_inv_fast () |
|
|
978 | { |
|
|
979 | while (object *op = inv) |
|
|
980 | { |
|
|
981 | // remove from object the fast way |
|
|
982 | op->flag [FLAG_REMOVED] = true; |
|
|
983 | op->env = 0; |
|
|
984 | if ((inv = inv->below)) |
|
|
985 | inv->above = 0; |
|
|
986 | |
|
|
987 | // then destroy |
|
|
988 | op->destroy (); |
|
|
989 | } |
|
|
990 | } |
|
|
991 | |
|
|
992 | void |
|
|
993 | object::freelist_free (int count) |
|
|
994 | { |
|
|
995 | while (count-- && freelist) |
|
|
996 | { |
|
|
997 | freelist_item *next = freelist->next; |
|
|
998 | // count is being "destroyed" |
|
|
999 | |
|
|
1000 | sfree ((char *)freelist, sizeof (object)); |
|
|
1001 | |
|
|
1002 | freelist = next; |
|
|
1003 | --free_count; |
|
|
1004 | } |
|
|
1005 | } |
|
|
1006 | |
|
|
1007 | object * |
944 | object *object::create () |
1008 | object::create () |
945 | { |
1009 | { |
946 | object *op = new object; |
1010 | object *op; |
|
|
1011 | |
|
|
1012 | if (freelist) |
|
|
1013 | { |
|
|
1014 | freelist_item li = *freelist; |
|
|
1015 | memset (freelist, 0, sizeof (object)); |
|
|
1016 | |
|
|
1017 | op = new (freelist) object; |
|
|
1018 | op->count = li.count; |
|
|
1019 | |
|
|
1020 | freelist = li.next; |
|
|
1021 | --free_count; |
|
|
1022 | } |
|
|
1023 | else |
|
|
1024 | { |
|
|
1025 | void *ni = salloc0<char> (sizeof (object)); |
|
|
1026 | |
|
|
1027 | op = new(ni) object; |
|
|
1028 | |
|
|
1029 | op->count = ++object_count; |
|
|
1030 | } |
|
|
1031 | |
947 | op->link (); |
1032 | op->link (); |
|
|
1033 | |
948 | return op; |
1034 | return op; |
949 | } |
1035 | } |
950 | |
1036 | |
|
|
1037 | void |
|
|
1038 | object::do_delete () |
|
|
1039 | { |
|
|
1040 | uint32_t count = this->count; |
|
|
1041 | |
|
|
1042 | this->~object (); |
|
|
1043 | |
|
|
1044 | freelist_item *li = (freelist_item *)this; |
|
|
1045 | li->next = freelist; |
|
|
1046 | li->count = count; |
|
|
1047 | |
|
|
1048 | freelist = li; |
|
|
1049 | ++free_count; |
|
|
1050 | } |
|
|
1051 | |
951 | static struct freed_map : maptile |
1052 | static struct freed_map : maptile |
952 | { |
1053 | { |
953 | freed_map () |
1054 | freed_map () |
|
|
1055 | : maptile (3, 3) |
954 | { |
1056 | { |
955 | path = "<freed objects map>"; |
1057 | path = "<freed objects map>"; |
956 | name = "/internal/freed_objects_map"; |
1058 | name = "/internal/freed_objects_map"; |
957 | width = 3; |
|
|
958 | height = 3; |
|
|
959 | no_drop = 1; |
1059 | no_drop = 1; |
960 | no_reset = 1; |
1060 | no_reset = 1; |
961 | |
1061 | |
962 | alloc (); |
|
|
963 | in_memory = MAP_ACTIVE; |
1062 | in_memory = MAP_ACTIVE; |
964 | } |
1063 | } |
965 | |
1064 | |
966 | ~freed_map () |
1065 | ~freed_map () |
967 | { |
1066 | { |
… | |
… | |
1018 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1117 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1019 | head->destroy (); |
1118 | head->destroy (); |
1020 | return; |
1119 | return; |
1021 | } |
1120 | } |
1022 | |
1121 | |
1023 | destroy_inv (false); |
1122 | destroy_inv_fast (); |
1024 | |
1123 | |
1025 | if (is_head ()) |
1124 | if (is_head ()) |
1026 | if (sound_destroy) |
1125 | if (sound_destroy) |
1027 | play_sound (sound_destroy); |
1126 | play_sound (sound_destroy); |
1028 | else if (flag [FLAG_MONSTER]) |
1127 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1060 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
1159 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
1061 | if (object *pl = visible_to ()) |
1160 | if (object *pl = visible_to ()) |
1062 | esrv_del_item (pl->contr, count); |
1161 | esrv_del_item (pl->contr, count); |
1063 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1162 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1064 | |
1163 | |
1065 | adjust_weight (env, -total_weight ()); |
1164 | adjust_weight (env, total_weight (), 0); |
1066 | |
1165 | |
1067 | object *pl = in_player (); |
1166 | object *pl = in_player (); |
1068 | |
1167 | |
1069 | /* we set up values so that it could be inserted into |
1168 | /* we set up values so that it could be inserted into |
1070 | * the map, but we don't actually do that - it is up |
1169 | * the map, but we don't actually do that - it is up |
… | |
… | |
1084 | |
1183 | |
1085 | if (pl && pl->is_player ()) |
1184 | if (pl && pl->is_player ()) |
1086 | { |
1185 | { |
1087 | if (expect_false (pl->contr->combat_ob == this)) |
1186 | if (expect_false (pl->contr->combat_ob == this)) |
1088 | { |
1187 | { |
1089 | pl->apply (pl->contr->combat_ob, AP_UNAPPLY); |
1188 | pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE); |
1090 | pl->contr->combat_ob = 0; |
1189 | pl->contr->combat_ob = 0; |
1091 | if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); |
1190 | if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); |
1092 | } |
1191 | } |
1093 | |
1192 | |
1094 | if (expect_false (pl->contr->ranged_ob == this)) |
1193 | if (expect_false (pl->contr->ranged_ob == this)) |
1095 | { |
1194 | { |
1096 | pl->apply (pl->contr->ranged_ob, AP_UNAPPLY); |
1195 | pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE); |
1097 | pl->contr->ranged_ob = 0; |
1196 | pl->contr->ranged_ob = 0; |
1098 | if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); |
1197 | if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); |
1099 | } |
1198 | } |
1100 | |
1199 | |
1101 | pl->contr->queue_stats_update (); |
1200 | pl->contr->queue_stats_update (); |
… | |
… | |
1128 | else if (pl->container_ () == this) |
1227 | else if (pl->container_ () == this) |
1129 | { |
1228 | { |
1130 | // removing a container should close it |
1229 | // removing a container should close it |
1131 | close_container (); |
1230 | close_container (); |
1132 | } |
1231 | } |
1133 | |
1232 | else |
1134 | esrv_del_item (pl->contr, count); |
1233 | esrv_del_item (pl->contr, count); |
1135 | } |
1234 | } |
1136 | |
1235 | |
1137 | /* link the object above us */ |
1236 | /* link the object above us */ |
1138 | // re-link, make sure compiler can easily use cmove |
1237 | // re-link, make sure compiler can easily use cmove |
1139 | *(above ? &above->below : &ms.top) = below; |
1238 | *(above ? &above->below : &ms.top) = below; |
… | |
… | |
1325 | // from here :/ |
1424 | // from here :/ |
1326 | op->nrof += tmp->nrof; |
1425 | op->nrof += tmp->nrof; |
1327 | tmp->destroy (); |
1426 | tmp->destroy (); |
1328 | } |
1427 | } |
1329 | |
1428 | |
1330 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1429 | op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1331 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1430 | op->clr_flag (FLAG_INV_LOCKED); |
1332 | |
1431 | |
1333 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1432 | if (!op->flag [FLAG_ALIVE]) |
1334 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1433 | op->clr_flag (FLAG_NO_STEAL); |
1335 | |
1434 | |
1336 | if (flag & INS_BELOW_ORIGINATOR) |
1435 | if (flag & INS_BELOW_ORIGINATOR) |
1337 | { |
1436 | { |
1338 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1437 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1339 | { |
1438 | { |
… | |
… | |
1374 | * when lots of spells are cast in one area. Currently, it is presumed |
1473 | * when lots of spells are cast in one area. Currently, it is presumed |
1375 | * that flying non pickable objects are spell objects. |
1474 | * that flying non pickable objects are spell objects. |
1376 | */ |
1475 | */ |
1377 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1476 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1378 | { |
1477 | { |
1379 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1478 | if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR]) |
1380 | floor = tmp; |
1479 | floor = tmp; |
1381 | |
1480 | |
1382 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1481 | if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR]) |
1383 | { |
1482 | { |
1384 | /* We insert above top, so we want this object below this */ |
1483 | /* We insert above top, so we want this object below this */ |
1385 | top = tmp->below; |
1484 | top = tmp->below; |
1386 | break; |
1485 | break; |
1387 | } |
1486 | } |
… | |
… | |
1405 | && (op->face && !faces [op->face].visibility)) |
1504 | && (op->face && !faces [op->face].visibility)) |
1406 | { |
1505 | { |
1407 | object *last; |
1506 | object *last; |
1408 | |
1507 | |
1409 | for (last = top; last != floor; last = last->below) |
1508 | for (last = top; last != floor; last = last->below) |
1410 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1509 | if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT)) |
1411 | break; |
1510 | break; |
1412 | |
1511 | |
1413 | /* Check to see if we found the object that blocks view, |
1512 | /* Check to see if we found the object that blocks view, |
1414 | * and make sure we have a below pointer for it so that |
1513 | * and make sure we have a below pointer for it so that |
1415 | * we can get inserted below this one, which requires we |
1514 | * we can get inserted below this one, which requires we |
… | |
… | |
1488 | */ |
1587 | */ |
1489 | |
1588 | |
1490 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1589 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1491 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1590 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1492 | { |
1591 | { |
1493 | if (check_move_on (op, originator)) |
1592 | if (check_move_on (op, originator, flag)) |
1494 | return 0; |
1593 | return 0; |
1495 | |
1594 | |
1496 | /* If we are a multi part object, lets work our way through the check |
1595 | /* If we are a multi part object, let's work our way through the check |
1497 | * walk on's. |
1596 | * walk on's. |
1498 | */ |
1597 | */ |
1499 | for (object *tmp = op->more; tmp; tmp = tmp->more) |
1598 | for (object *tmp = op->more; tmp; tmp = tmp->more) |
1500 | if (check_move_on (tmp, originator)) |
1599 | if (check_move_on (tmp, originator, flag)) |
1501 | return 0; |
1600 | return 0; |
1502 | } |
1601 | } |
1503 | |
1602 | |
1504 | return op; |
1603 | return op; |
1505 | } |
1604 | } |
… | |
… | |
1546 | || (items < m->max_items |
1645 | || (items < m->max_items |
1547 | && ms.volume () < m->max_volume)) |
1646 | && ms.volume () < m->max_volume)) |
1548 | return true; |
1647 | return true; |
1549 | |
1648 | |
1550 | if (originator && originator->is_player ()) |
1649 | if (originator && originator->is_player ()) |
1551 | originator->contr->failmsg (format ( |
1650 | originator->contr->failmsgf ( |
1552 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
1651 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
1553 | query_name () |
1652 | query_name () |
1554 | )); |
1653 | ); |
1555 | |
1654 | |
1556 | return false; |
1655 | return false; |
1557 | } |
1656 | } |
1558 | |
1657 | |
1559 | /* |
1658 | /* |
… | |
… | |
1571 | |
1670 | |
1572 | nr = min (nr, nrof); |
1671 | nr = min (nr, nrof); |
1573 | |
1672 | |
1574 | if (nrof > nr) |
1673 | if (nrof > nr) |
1575 | { |
1674 | { |
|
|
1675 | sint64 oweight = total_weight (); |
|
|
1676 | |
1576 | nrof -= nr; |
1677 | nrof -= nr; |
1577 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
|
|
1578 | |
1678 | |
1579 | if (object *pl = visible_to ()) |
1679 | if (object *pl = visible_to ()) |
1580 | esrv_update_item (UPD_NROF, pl, this); |
1680 | esrv_update_item (UPD_NROF, pl, this); |
|
|
1681 | |
|
|
1682 | adjust_weight (env, oweight, total_weight ()); |
1581 | |
1683 | |
1582 | return true; |
1684 | return true; |
1583 | } |
1685 | } |
1584 | else |
1686 | else |
1585 | { |
1687 | { |
… | |
… | |
1660 | if (op->nrof) |
1762 | if (op->nrof) |
1661 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1763 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1662 | if (object::can_merge (tmp, op)) |
1764 | if (object::can_merge (tmp, op)) |
1663 | { |
1765 | { |
1664 | /* return the original object and remove inserted object |
1766 | /* return the original object and remove inserted object |
1665 | (client needs the original object) */ |
1767 | (client prefers the original object) */ |
|
|
1768 | |
|
|
1769 | // carring must be 0 for mergable objects |
|
|
1770 | sint64 oweight = tmp->weight * tmp->nrof; |
|
|
1771 | |
1666 | tmp->nrof += op->nrof; |
1772 | tmp->nrof += op->nrof; |
1667 | |
1773 | |
1668 | if (object *pl = tmp->visible_to ()) |
1774 | if (object *pl = tmp->visible_to ()) |
1669 | esrv_update_item (UPD_NROF, pl, tmp); |
1775 | esrv_update_item (UPD_NROF, pl, tmp); |
1670 | |
1776 | |
1671 | adjust_weight (this, op->total_weight ()); |
1777 | adjust_weight (this, oweight, tmp->weight * tmp->nrof); |
1672 | |
1778 | |
1673 | op->destroy (); |
1779 | op->destroy (); |
1674 | op = tmp; |
1780 | op = tmp; |
1675 | goto inserted; |
1781 | goto inserted; |
1676 | } |
1782 | } |
… | |
… | |
1692 | op->flag [FLAG_REMOVED] = 0; |
1798 | op->flag [FLAG_REMOVED] = 0; |
1693 | |
1799 | |
1694 | if (object *pl = op->visible_to ()) |
1800 | if (object *pl = op->visible_to ()) |
1695 | esrv_send_item (pl, op); |
1801 | esrv_send_item (pl, op); |
1696 | |
1802 | |
1697 | adjust_weight (this, op->total_weight ()); |
1803 | adjust_weight (this, 0, op->total_weight ()); |
1698 | |
1804 | |
1699 | inserted: |
1805 | inserted: |
1700 | /* reset the light list and los of the players on the map */ |
1806 | /* reset the light list and los of the players on the map */ |
1701 | if (op->glow_radius && is_on_map ()) |
1807 | if (op->glow_radius && is_on_map ()) |
1702 | { |
1808 | { |
… | |
… | |
1731 | * MSW 2001-07-08: Check all objects on space, not just those below |
1837 | * MSW 2001-07-08: Check all objects on space, not just those below |
1732 | * object being inserted. insert_ob_in_map may not put new objects |
1838 | * object being inserted. insert_ob_in_map may not put new objects |
1733 | * on top. |
1839 | * on top. |
1734 | */ |
1840 | */ |
1735 | int |
1841 | int |
1736 | check_move_on (object *op, object *originator) |
1842 | check_move_on (object *op, object *originator, int flags) |
1737 | { |
1843 | { |
1738 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1844 | if (op->flag [FLAG_NO_APPLY]) |
1739 | return 0; |
1845 | return 0; |
1740 | |
1846 | |
1741 | object *tmp; |
1847 | object *tmp; |
1742 | maptile *m = op->map; |
1848 | maptile *m = op->map; |
1743 | int x = op->x, y = op->y; |
1849 | int x = op->x, y = op->y; |
… | |
… | |
1780 | * Second check makes sure that the movement types not being slowed |
1886 | * Second check makes sure that the movement types not being slowed |
1781 | * (~slow_move) is not blocked on this space - just because the |
1887 | * (~slow_move) is not blocked on this space - just because the |
1782 | * space doesn't slow down swimming (for example), if you can't actually |
1888 | * space doesn't slow down swimming (for example), if you can't actually |
1783 | * swim on that space, can't use it to avoid the penalty. |
1889 | * swim on that space, can't use it to avoid the penalty. |
1784 | */ |
1890 | */ |
1785 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1891 | if (!op->flag [FLAG_WIZPASS]) |
1786 | { |
1892 | { |
1787 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1893 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1788 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1894 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1789 | { |
1895 | { |
1790 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1896 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
… | |
… | |
1800 | |
1906 | |
1801 | /* Basically same logic as above, except now for actual apply. */ |
1907 | /* Basically same logic as above, except now for actual apply. */ |
1802 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1908 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1803 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1909 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1804 | { |
1910 | { |
|
|
1911 | if ((flags & INS_NO_AUTO_EXIT) |
|
|
1912 | && (tmp->type == EXIT || tmp->type == TELEPORTER |
|
|
1913 | || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead |
|
|
1914 | continue; |
|
|
1915 | |
1805 | move_apply (tmp, op, originator); |
1916 | move_apply (tmp, op, originator); |
1806 | |
1917 | |
1807 | if (op->destroyed ()) |
1918 | if (op->destroyed ()) |
1808 | return 1; |
1919 | return 1; |
1809 | |
1920 | |
… | |
… | |
1921 | void |
2032 | void |
1922 | flag_inv (object *op, int flag) |
2033 | flag_inv (object *op, int flag) |
1923 | { |
2034 | { |
1924 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2035 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1925 | { |
2036 | { |
1926 | SET_FLAG (tmp, flag); |
2037 | tmp->set_flag (flag); |
1927 | flag_inv (tmp, flag); |
2038 | flag_inv (tmp, flag); |
1928 | } |
2039 | } |
1929 | } |
2040 | } |
1930 | |
2041 | |
1931 | /* |
2042 | /* |
… | |
… | |
1934 | void |
2045 | void |
1935 | unflag_inv (object *op, int flag) |
2046 | unflag_inv (object *op, int flag) |
1936 | { |
2047 | { |
1937 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2048 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1938 | { |
2049 | { |
1939 | CLEAR_FLAG (tmp, flag); |
2050 | tmp->clr_flag (flag); |
1940 | unflag_inv (tmp, flag); |
2051 | unflag_inv (tmp, flag); |
1941 | } |
2052 | } |
1942 | } |
2053 | } |
1943 | |
2054 | |
1944 | /* |
2055 | /* |
… | |
… | |
2134 | { |
2245 | { |
2135 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2246 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2136 | } |
2247 | } |
2137 | |
2248 | |
2138 | /* |
2249 | /* |
2139 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2250 | * find_dir_2(delta-x,delta-y) will return a direction value |
2140 | * an object which has subtracted the x and y coordinates of another |
2251 | * for running into direct [dx, dy]. |
2141 | * object, needs to travel toward it. |
2252 | * (the opposite of crossfire's find_dir_2!) |
2142 | */ |
2253 | */ |
2143 | int |
2254 | int |
2144 | find_dir_2 (int x, int y) |
2255 | find_dir_2 (int x, int y) |
2145 | { |
2256 | { |
|
|
2257 | #if 1 // new algorithm |
|
|
2258 | // this works by putting x, y into 16 sectors, which |
|
|
2259 | // are not equal sized, but are a better approximation |
|
|
2260 | // then the old algorithm, and then using a mapping |
|
|
2261 | // table to map it into a direction value. |
|
|
2262 | // basically, it maps these comparisons to each bit |
|
|
2263 | // bit #3: x < 0 |
|
|
2264 | // bit #2: y < 0 |
|
|
2265 | // bit #1: x > y |
|
|
2266 | // bit #0: x > 2y |
|
|
2267 | |
|
|
2268 | static const uint8 dir[16] = { |
|
|
2269 | 4, 5, 4, 3, |
|
|
2270 | 2, 1, 2, 3, |
|
|
2271 | 6, 5, 6, 7, |
|
|
2272 | 8, 1, 8, 7, |
|
|
2273 | }; |
|
|
2274 | int sector = 0; |
|
|
2275 | |
|
|
2276 | // this is a bit ugly, but more likely to result in branchless code |
|
|
2277 | sector |= x < 0 ? 8 : 0; |
|
|
2278 | x = x < 0 ? -x : x; // abs |
|
|
2279 | |
|
|
2280 | sector |= y < 0 ? 4 : 0; |
|
|
2281 | y = y < 0 ? -y : y; // abs |
|
|
2282 | |
|
|
2283 | if (x > y) |
|
|
2284 | { |
|
|
2285 | sector |= 2; |
|
|
2286 | |
|
|
2287 | if (x > y * 2) |
|
|
2288 | sector |= 1; |
|
|
2289 | } |
|
|
2290 | else |
|
|
2291 | { |
|
|
2292 | if (y > x * 2) |
|
|
2293 | sector |= 1; |
|
|
2294 | else if (!y) |
|
|
2295 | return 0; // x == 0 here |
|
|
2296 | } |
|
|
2297 | |
|
|
2298 | return dir [sector]; |
|
|
2299 | #else // old algorithm |
2146 | int q; |
2300 | int q; |
2147 | |
2301 | |
2148 | if (y) |
2302 | if (y) |
2149 | q = x * 100 / y; |
2303 | q = 128 * x / y; |
2150 | else if (x) |
2304 | else if (x) |
2151 | q = -300 * x; |
2305 | q = -512 * x; // to make it > 309 |
2152 | else |
2306 | else |
2153 | return 0; |
2307 | return 0; |
2154 | |
2308 | |
2155 | if (y > 0) |
2309 | if (y > 0) |
2156 | { |
2310 | { |
2157 | if (q < -242) |
2311 | if (q < -309) return 7; |
|
|
2312 | if (q < -52) return 6; |
|
|
2313 | if (q < 52) return 5; |
|
|
2314 | if (q < 309) return 4; |
|
|
2315 | |
2158 | return 3; |
2316 | return 3; |
2159 | if (q < -41) |
2317 | } |
2160 | return 2; |
2318 | else |
2161 | if (q < 41) |
2319 | { |
2162 | return 1; |
2320 | if (q < -309) return 3; |
2163 | if (q < 242) |
2321 | if (q < -52) return 2; |
2164 | return 8; |
2322 | if (q < 52) return 1; |
|
|
2323 | if (q < 309) return 8; |
|
|
2324 | |
2165 | return 7; |
2325 | return 7; |
2166 | } |
2326 | } |
2167 | |
2327 | #endif |
2168 | if (q < -242) |
|
|
2169 | return 7; |
|
|
2170 | if (q < -41) |
|
|
2171 | return 6; |
|
|
2172 | if (q < 41) |
|
|
2173 | return 5; |
|
|
2174 | if (q < 242) |
|
|
2175 | return 4; |
|
|
2176 | |
|
|
2177 | return 3; |
|
|
2178 | } |
2328 | } |
2179 | |
2329 | |
2180 | /* |
2330 | /* |
2181 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2331 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2182 | * between two directions (which are expected to be absolute (see absdir()) |
2332 | * between two directions (which are expected to be absolute (see absdir()) |
2183 | */ |
2333 | */ |
2184 | int |
2334 | int |
2185 | dirdiff (int dir1, int dir2) |
2335 | dirdiff (int dir1, int dir2) |
2186 | { |
2336 | { |
2187 | int d; |
|
|
2188 | |
|
|
2189 | d = abs (dir1 - dir2); |
2337 | int d = abs (dir1 - dir2); |
2190 | if (d > 4) |
|
|
2191 | d = 8 - d; |
|
|
2192 | |
2338 | |
2193 | return d; |
2339 | return d > 4 ? 8 - d : d; |
2194 | } |
2340 | } |
2195 | |
2341 | |
2196 | /* peterm: |
2342 | /* peterm: |
2197 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2343 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2198 | * Basically, this is a table of directions, and what directions |
2344 | * Basically, this is a table of directions, and what directions |
… | |
… | |
2304 | * Add a check so we can't pick up invisible objects (0.93.8) |
2450 | * Add a check so we can't pick up invisible objects (0.93.8) |
2305 | */ |
2451 | */ |
2306 | int |
2452 | int |
2307 | can_pick (const object *who, const object *item) |
2453 | can_pick (const object *who, const object *item) |
2308 | { |
2454 | { |
2309 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2455 | return /*who->flag [FLAG_WIZ]|| */ |
2310 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2456 | (item->weight > 0 && !item->flag [FLAG_NO_PICK] && |
2311 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2457 | !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2312 | } |
2458 | } |
2313 | |
2459 | |
2314 | /* |
2460 | /* |
2315 | * create clone from object to another |
2461 | * create clone from object to another |
2316 | */ |
2462 | */ |
… | |
… | |
2656 | } |
2802 | } |
2657 | else |
2803 | else |
2658 | move_type = mt; |
2804 | move_type = mt; |
2659 | } |
2805 | } |
2660 | |
2806 | |
|
|
2807 | /* object should be a player. |
|
|
2808 | * we return the object the player has marked with the 'mark' command |
|
|
2809 | * below. If no match is found (or object has changed), we return |
|
|
2810 | * NULL. We leave it up to the calling function to print messages if |
|
|
2811 | * nothing is found. |
|
|
2812 | */ |
|
|
2813 | object * |
|
|
2814 | object::mark () const |
|
|
2815 | { |
|
|
2816 | if (contr && contr->mark && contr->mark->env == this) |
|
|
2817 | return contr->mark; |
|
|
2818 | else |
|
|
2819 | return 0; |
|
|
2820 | } |
|
|
2821 | |
|
|
2822 | // put marked object first in the inventory |
|
|
2823 | // this is used by identify-like spells so players can influence |
|
|
2824 | // the order a bit. |
|
|
2825 | void |
|
|
2826 | object::splay_marked () |
|
|
2827 | { |
|
|
2828 | if (object *marked = mark ()) |
|
|
2829 | splay (marked); |
|
|
2830 | } |
|
|
2831 | |